Merge "Fix issue with TransactionProxy throttling test failures"

diff --git a/features/pom.xml b/features/pom.xml
index ed4fa499a9aeb075d3308474c33997742b49b537..9363d9e03be18c1e7af7a889e9902e9fc905e312 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -22,6 +22,5 @@
     <module>netconf-connector</module>
     <module>restconf</module>
     <module>extras</module>
-    <module>neutron</module>
   </modules>
 </project>

diff --git a/features/neutron/pom.xml b/opendaylight/networkconfiguration/neutron/features/pom.xml
similarity index 100%
rename from features/neutron/pom.xml
rename to opendaylight/networkconfiguration/neutron/features/pom.xml

diff --git a/features/neutron/src/main/resources/features.xml b/opendaylight/networkconfiguration/neutron/features/src/main/resources/features.xml
similarity index 100%
rename from features/neutron/src/main/resources/features.xml
rename to opendaylight/networkconfiguration/neutron/features/src/main/resources/features.xml

diff --git a/pom.xml b/pom.xml
index 0aaf0945c6bce63e1d60fb6b868b5b851a240c2b..d41b51b2145828151de5b2fe72102d61314feb77 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -30,6 +30,7 @@
     <module>opendaylight/networkconfiguration/neutron</module>
     <module>opendaylight/networkconfiguration/neutron/implementation</module>
     <module>opendaylight/networkconfiguration/neutron/northbound</module>
+    <module>opendaylight/networkconfiguration/neutron/features</module>
 
     <!-- Parents -->
     <module>opendaylight/commons/concepts</module>