Restore faas to distribution test

Change-Id: Ib899ee57b8ca9d3950bfc73784b8d0c5ec93643a
Signed-off-by: Luis Gomez <ecelgp@gmail.com>

diff --git a/features-test/src/main/resources/features.xml b/features-test/src/main/resources/features.xml
index 460a2622954afc0a80fc0e3a09030203639c3714..a26c77f3544d1d968413b69fd26014ccc15b8c31 100644 (file)
--- a/features-test/src/main/resources/features.xml
+++ b/features-test/src/main/resources/features.xml
@@ -142,13 +142,9 @@
             Also, DIDM merge jobs are currently failing.
         <feature version='${didm.version}'>odl-didm-all</feature>
         -->
-        <!-- Commented out, because it breaks the controller in presence of netvirt and other projects
         <feature version='${feature.faas.version}'>odl-faas-base</feature>
-        -->
         <feature version='${feature.genius.version}'>odl-genius-rest</feature>
-        <!-- Commented out, because faas breaks the controller in presence of netvirt and other projects
         <feature version='${feature.groupbasedpolicy.version}'>odl-groupbasedpolicy-faas</feature>
-        -->
         <feature version='${feature.groupbasedpolicy.version}'>odl-groupbasedpolicy-iovisor</feature>
         <feature version='${feature.groupbasedpolicy.version}'>odl-groupbasedpolicy-neutronmapper</feature>
         <feature version='${feature.groupbasedpolicy.version}'>odl-groupbasedpolicy-neutron-and-ofoverlay</feature>