commit 7bdf4d4daaf7910f8b58a7aa8dc399727f5d8475
author sunish vk <sunish.vk@cognizant.com> Fri Jun 24 12:29:43 2016 +0530
committer sunish vk <sunish.vk@cognizant.com> Fri Jun 24 14:28:17 2016 +0530
tree f8cf79ab4cddad39135bef9dd72345d5eeb44879
parent 465a9b8ec238f5de291ae87c247978bc6682c56c

ISIS protocol manual merge from 1.6 due to cherry pick merge conflict

Change-Id: I6c3abf6a83ddaeba76293dc7864fcec88e9b4e7e

providers/isis/app/features.xml

diff --git a/providers/isis/app/features.xml b/providers/isis/app/features.xml
index 132bcda..03c9f3e 100644
--- a/providers/isis/app/features.xml
+++ b/providers/isis/app/features.xml
@@ -21,7 +21,8 @@
         <bundle>mvn:${project.groupId}/onos-isis-api/${project.version}</bundle>
         <bundle>mvn:${project.groupId}/onos-isis-isisio/${project.version}</bundle>
         <bundle>mvn:${project.groupId}/onos-isis-ctl/${project.version}</bundle>
-        <bundle>mvn:${project.groupId}/onos-isis-provider-device/${project.version}</bundle>
+        <bundle>mvn:${project.groupId}/onos-isis-provider-topology/${project.version}</bundle>
         <bundle>mvn:${project.groupId}/onos-isis-provider-cfg/${project.version}</bundle>
+        <bundle>mvn:${project.groupId}/onos-isis-provider-cli/${project.version}</bundle>
     </feature>
-</features>
+</features>
\ No newline at end of file