Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge changes I162c84f7,Iffa37d3f
[controller.git]
/
pom.xml
diff --git
a/pom.xml
b/pom.xml
index af8400242924501d0aca460e46da718327876bdb..e4c51b7839cff2f9af808d3fc78866bd0f599d45 100644
(file)
--- a/
pom.xml
+++ b/
pom.xml
@@
-124,15
+124,13
@@
<module>opendaylight/commons/parent</module>
<module>opendaylight/commons/logback_settings</module>
<module>opendaylight/commons/filter-valve</module>
<module>opendaylight/commons/parent</module>
<module>opendaylight/commons/logback_settings</module>
<module>opendaylight/commons/filter-valve</module>
+ <module>opendaylight/commons/liblldp</module>
<!-- Karaf Distribution -->
<!-- Karaf Distribution -->
- <module>features/base</module>
- <module>features/controller</module>
- <module>features/adsal</module>
- <module>features/extras</module>
<module>opendaylight/dummy-console</module>
<module>opendaylight/karaf-branding</module>
<module>opendaylight/distribution/opendaylight-karaf</module>
<module>opendaylight/dummy-console</module>
<module>opendaylight/karaf-branding</module>
<module>opendaylight/distribution/opendaylight-karaf</module>
+ <module>features</module>
</modules>
<scm>
<connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
</modules>
<scm>
<connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>