From: Abhijit Kumbhare <abhijit.kumbhare@ericsson.com>
Date: Tue, 28 Feb 2017 20:22:53 +0000 (+0000)
Subject: Merge "Replace odl-dlux-core with odl-dluxapps-topology"
X-Git-Tag: release/carbon~71
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=163b3dd5740b83123674df4a65f0de40860bb3e6;p=openflowplugin.git

Merge "Replace odl-dlux-core with odl-dluxapps-topology"
---

163b3dd5740b83123674df4a65f0de40860bb3e6
diff --cc features-he/src/main/features/features.xml
index 05b331e185,2d10256180..58acd5231a
--- a/features-he/src/main/features/features.xml
+++ b/features-he/src/main/features/features.xml
@@@ -78,8 -78,9 +78,8 @@@
      </feature>
      <feature name='odl-openflowplugin-flow-services-ui-he' description="OpenDaylight :: Openflow Plugin :: Flow Services :: UI" version='${project.version}'>
          <feature version="${project.version}">odl-openflowplugin-flow-services-rest-he</feature>
-         <feature version="${dlux.version}">odl-dlux-core</feature>
+         <feature version="${dluxapps.version}">odl-dluxapps-topology</feature>
          <feature version="${restconf.version}">odl-mdsal-apidocs</feature>
 -        <feature version="${mdsal.version}">odl-mdsal-xsql</feature>
      </feature>
  
      <!-- CBENCH TESTING -->
diff --cc features/src/main/features/features.xml
index f565f48875,9f345998a1..9f2596fe1d
--- a/features/src/main/features/features.xml
+++ b/features/src/main/features/features.xml
@@@ -21,8 -21,9 +21,8 @@@
  
      <feature name='odl-openflowplugin-flow-services-ui' description="OpenDaylight :: Openflow Plugin :: Flow Services :: UI" version='${project.version}'>
          <feature version="${project.version}">odl-openflowplugin-flow-services-rest</feature>
-         <feature version="${dlux.version}">odl-dlux-core</feature>
+         <feature version="${dluxapps.version}">odl-dluxapps-topology</feature>
          <feature version="${restconf.version}">odl-mdsal-apidocs</feature>
 -        <feature version="${mdsal.version}">odl-mdsal-xsql</feature>
      </feature>
  
      <feature name='odl-openflowplugin-flow-services-rest' description="OpenDaylight :: Openflow Plugin :: Flow Services :: REST" version='${project.version}'>