From: Isaku Yamahata <isaku.yamahata@intel.com>
Date: Mon, 20 Jun 2016 19:17:01 +0000 (-0700)
Subject: Revert "neutron northbound: temporarily disable gbp neutron feature"
X-Git-Tag: release/boron~39
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;ds=sidebyside;h=63958794a7818da0487ced226ad567b4b6a3c5c2;hp=247d3618bf3547d545c757d7e635c11593dbe7cd;p=integration%2Fdistribution.git

Revert "neutron northbound: temporarily disable gbp neutron feature"

This reverts commit b098f9625965f859d07363ee2023060b75885f97.

Change-Id: I067466d1bdb5985b2cb0b54eea432d1b88874add
Signed-off-by: Isaku Yamahata <isaku.yamahata@intel.com>
---

diff --git a/features-test/src/main/resources/features.xml b/features-test/src/main/resources/features.xml
index f1b4d0ec..a26c77f3 100644
--- a/features-test/src/main/resources/features.xml
+++ b/features-test/src/main/resources/features.xml
@@ -146,6 +146,9 @@
         <feature version='${feature.genius.version}'>odl-genius-rest</feature>
         <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>
+        <feature version='${feature.groupbasedpolicy.version}'>odl-groupbasedpolicy-neutron-vpp-mapper</feature>
         <feature version='${feature.groupbasedpolicy.version}'>odl-groupbasedpolicy-ne-location-provider</feature>
         <feature version='${feature.groupbasedpolicy.version}'>odl-groupbasedpolicy-ofoverlay</feature>
         <feature version='${feature.groupbasedpolicy.version}'>odl-groupbasedpolicy-sxp-mapper</feature>