commit b64514778bea55969a6674c04b2d2b6ef85ace4f
author Thomas Vachuska <tom@onlab.us> Tue Mar 31 16:03:56 2015 -0700
committer Thomas Vachuska <tom@onlab.us> Tue Mar 31 16:03:56 2015 -0700
tree e3749da9cb42325d5780187db0b7a21e049f2204
parent 3074fb22dd22f4fafab7cd161ebafcb077e53715

Moved demo app back to main onos repo.

Change-Id: I3e445b28c1a19f9af9b582a05f3f6403af6d19c2

features/features.xml

diff --git a/features/features.xml b/features/features.xml
index ef79503..fb76afd 100644
--- a/features/features.xml
+++ b/features/features.xml
@@ -241,6 +241,13 @@
         <bundle>mvn:org.onosproject/onos-app-election/@ONOS-VERSION</bundle>
     </feature>
 
+    <feature name="onos-app-demo" version="@FEATURE-VERSION"
+             description="ONOS demo applications">
+        <feature>onos-api</feature>
+        <bundle>mvn:org.onosproject/onlab-misc/@ONOS-VERSION</bundle>
+        <bundle>mvn:org.onosproject/onos-app-demo/@ONOS-VERSION</bundle>
+    </feature>
+
 
     <!-- ONOS sample app features: to be moved to a different repo -->
 
@@ -258,13 +265,6 @@
         <bundle>mvn:org.onosproject/onos-app-ifwd/@ONOS-VERSION</bundle>
     </feature>
 
-    <feature name="onos-app-demo" version="@FEATURE-VERSION"
-             description="ONOS demo applications">
-        <feature>onos-api</feature>
-        <bundle>mvn:org.onosproject/onlab-misc/@ONOS-VERSION</bundle>
-        <bundle>mvn:org.onosproject/onos-app-demo/@ONOS-VERSION</bundle>
-    </feature>
-
     <feature name="onos-app-database-perf" version="@FEATURE-VERSION"
              description="ONOS partitioned database perf application">
         <feature>onos-api</feature>