From: Tony Tkacik <ttkacik@cisco.com>
Date: Fri, 13 Feb 2015 13:40:23 +0000 (+0000)
Subject: Merge "Bring features/neutron into the same parent dir as everything else"
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=c671195065ce54e65f3b4a6da964871536f8a194;hp=bbaba878c38f381b0b924f89b29a1d0fcf6e2a2f

Merge "Bring features/neutron into the same parent dir as everything else"
---

diff --git a/features/pom.xml b/features/pom.xml
index ed4fa499a9..9363d9e03b 100644
--- 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 0aaf0945c6..d41b51b214 100644
--- 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>