From: Luis Gomez <ecelgp@gmail.com>
Date: Wed, 30 Mar 2016 03:17:03 +0000 (-0700)
Subject: BUG 5070 move odl-vpnservice-core to incompatible
X-Git-Tag: release/boron~70
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=integration%2Fdistribution.git;a=commitdiff_plain;h=c0763b99cfb5922258a3356608f3ad2349d583a8

BUG 5070 move odl-vpnservice-core to incompatible

Cherry pick https://git.opendaylight.org/gerrit/#/c/33436/ to master

Change-Id: I31608b39d14efd9e2f192cfe38e2c33cfdd5ba84
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 6a50d3bf..08a4fc0d 100644
--- a/features-test/src/main/resources/features.xml
+++ b/features-test/src/main/resources/features.xml
@@ -134,7 +134,6 @@
         <feature version='${feature.usc.version}'>odl-usc-channel-ui</feature>
         <feature version='${feature.usecplugin.version}'>odl-usecplugin-api</feature>
         <feature version='${feature.usecplugin.version}'>odl-usecplugin</feature>
-        <feature version='${feature.vpnservice.version}'>odl-vpnservice-core</feature>
     </feature>
 
     <!-- Please use aphabetical order for non-compatible features -->
@@ -171,6 +170,7 @@
         <feature version='${feature.snbi.version}'>odl-snbi-all</feature>
         <feature version='${feature.sfc.version}'>odl-sfcofl2</feature>
         <feature version='${feature.tsdr.version}'>odl-tsdr-hsqldb-all</feature>
+        <feature version='${feature.vpnservice.version}'>odl-vpnservice-core</feature>
         <feature version='${feature.vpnservice.version}'>odl-vpnservice-openstack</feature>
         <feature version='${feature.vtn-manager.version}'>odl-vtn-manager-neutron</feature>
         <feature version='${feature.vtn-manager.version}'>odl-vtn-manager-rest</feature>