From: Luis Gomez <ecelgp@gmail.com>
Date: Mon, 11 Jan 2016 03:33:10 +0000 (+0000)
Subject: Revert "Fix distribution"
X-Git-Tag: release/beryllium~16
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=integration%2Fdistribution.git;a=commitdiff_plain;h=84da33fd8e445f3d169ccab09047db6cbd19e0df

Revert "Fix distribution"

Restoring vpnservice features.

This reverts commit d0078f34547a785a76321621a70bcb55606ca321.

Change-Id: I182dfbe5aa2c54d4d782241b47a78c43bea912ea
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 e49f6e9f..297bcc37 100644
--- a/features-test/src/main/resources/features.xml
+++ b/features-test/src/main/resources/features.xml
@@ -137,9 +137,7 @@
         <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>
-<!--    Commented out as it timeouts SingleFeature test.
         <feature version='${feature.vpnservice.version}'>odl-vpnservice-core</feature>
--->
     </feature>
 
     <!-- Please use aphabetical order for non-compatible features -->
@@ -172,9 +170,7 @@
         <feature version='${feature.snbi.version}'>odl-snbi-all</feature>
 -->
         <feature version='${feature.tsdr.version}'>odl-tsdr-h2-all</feature>
-<!--    Commented out as it timeouts SingleFeature test.
         <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>
     </feature>