From: Luis Gomez <ecelgp@gmail.com>
Date: Mon, 4 Jul 2016 22:53:21 +0000 (-0700)
Subject: Restore faas to distribution test
X-Git-Tag: release/boron~32
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=integration%2Fdistribution.git;a=commitdiff_plain;h=ea51d9fb5a5960e67962e2d294be460d0dbdd543

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 460a2622..a26c77f3 100644
--- 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>