From: Ed Warnicke <eaw@cisco.com>
Date: Thu, 11 Sep 2014 15:46:55 +0000 (+0000)
Subject: Merge "Bug 1789: Reorder odl-mdsal-clustering feature before odl-restconf"
X-Git-Tag: release/helium~107
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=4a8688c9d42c0be307383f0483c819cb7a78d26d;hp=9349a1faaf61140c91822870852ce5182bea007f

Merge "Bug 1789: Reorder odl-mdsal-clustering feature before odl-restconf"
---

diff --git a/features/mdsal/src/main/resources/features.xml b/features/mdsal/src/main/resources/features.xml
index 132337828e..c336635df4 100644
--- a/features/mdsal/src/main/resources/features.xml
+++ b/features/mdsal/src/main/resources/features.xml
@@ -10,9 +10,9 @@
     <repository>mvn:org.opendaylight.controller/features-akka/${commons.opendaylight.version}/xml/features</repository>
     <feature name='odl-mdsal-all' version='${project.version}' description="OpenDaylight :: MDSAL :: All">
         <feature version='${project.version}'>odl-mdsal-broker</feature>
+        <feature version='${project.version}'>odl-mdsal-clustering</feature>
         <feature version='${project.version}'>odl-restconf</feature>
         <feature version='${project.version}'>odl-mdsal-xsql</feature>
-        <feature version='${project.version}'>odl-mdsal-clustering</feature>
         <feature version='${project.version}'>odl-toaster</feature>
     </feature>
     <feature name='odl-mdsal-broker' version='${project.version}' description="OpenDaylight :: MDSAL :: Broker">