Code Review / openflowplugin.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | combined (merge: 2c832a6 1cbbbd6)
Merge "Replace odl-dlux-core with odl-dluxapps-topology"
authorAbhijit Kumbhare <abhijit.kumbhare@ericsson.com>
Tue, 28 Feb 2017 20:22:53 +0000 (20:22 +0000)
committerGerrit Code Review <gerrit@opendaylight.org>
Tue, 28 Feb 2017 20:22:53 +0000 (20:22 +0000)
1  2 
features-he/src/main/features/features.xml patch | diff1 | diff2 | blob | history
features/src/main/features/features.xml patch | diff1 | diff2 | blob | history

diff --cc features-he/src/main/features/features.xml
index 05b331e1854b1909ef72dab2297dca2e7378e5a8,2d102561807d9c0d91d87bbca7bf55d3fb8606ef..58acd5231a2f096cf185e6b8242e8e48b9adfda8
--- 1/features-he/src/main/features/features.xml
--- 2/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 f565f488754502ba73401a0779c6b7d0cfc883b3,9f345998a11efcadea363fa0ffc5183908c1119b..9f2596fe1dec7f30c9adf07e2f77493146c16729
--- 1/features/src/main/features/features.xml
--- 2/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}'>
OpenFlow Plugin