Bug 5943: Change default endorsed jars

[integration/distribution.git] / features-test / src / main / resources / features.xml

diff --git a/features-test/src/main/resources/features.xml b/features-test/src/main/resources/features.xml
index 58f1565c8c7c54a02526e74b86ea8f08433e41ac..9906754a4b523ad5649ebaa19f336167d43d9189 100644 (file)
--- a/features-test/src/main/resources/features.xml
+++ b/features-test/src/main/resources/features.xml
@@ -133,14 +133,16 @@
         <feature version='${feature.usecplugin.version}'>odl-usecplugin</feature>
     </feature>
 
-    <!-- Please use aphabetical order for non-compatible features -->
+    <!-- Please use alphabetical order for non-compatible features -->
     <feature name='odl-integration-all' version='${project.version}'>
         <feature version='${feature.alto.version}'>odl-alto-release</feature>
         <!-- Commented out, because DIDM brings in Li designed OpenFlowPlugin
             which leads to BindException.
+            Also, DIDM merge jobs are currently failing.
         <feature version='${didm.version}'>odl-didm-all</feature>
         -->
         <feature version='${feature.faas.version}'>odl-faas-base</feature>
+        <feature version='${feature.genius.version}'>odl-genius-rest</feature>
         <feature version='${feature.groupbasedpolicy.version}'>odl-groupbasedpolicy-ofoverlay</feature>
         <feature version='${feature.groupbasedpolicy.version}'>odl-groupbasedpolicy-neutronmapper</feature>
         <feature version='${feature.groupbasedpolicy.version}'>odl-groupbasedpolicy-ui</feature>