From: Luis Gomez <ecelgp@gmail.com>
Date: Thu, 28 Apr 2016 01:39:52 +0000 (-0700)
Subject: Change alto feature to not-compatible list
X-Git-Tag: release/boron~61
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=integration%2Fdistribution.git;a=commitdiff_plain;h=c297709555db4e598175f26db5ac1c77081f3397

Change alto feature to not-compatible list

alto feature is interfearing with l2switch feature
This patch will fix l2switch -all- test issues

Change-Id: I56bf09ffd908caa02812d51ab5831e6697005281
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 1286f0e0..a848a730 100644
--- a/features-test/src/main/resources/features.xml
+++ b/features-test/src/main/resources/features.xml
@@ -62,7 +62,6 @@
         <feature version='${feature.aaa.version}'>odl-aaa-authz</feature>
         <feature version='${feature.netconf.version}'>odl-aaa-netconf-plugin</feature>
         <feature version='${feature.aaa.version}'>odl-aaa-sssd-plugin</feature>
-        <feature version='${feature.alto.version}'>odl-alto-release</feature>
         <!-- Remove Armoury from Beryllium release as per as committers consent:
         https://lists.opendaylight.org/pipermail/armoury-dev/2016-January/000081.html.
         Need to be uncommented once in Boron -->
@@ -135,6 +134,7 @@
 
     <!-- Please use aphabetical order for non-compatible features -->
     <feature name='odl-integration-all' version='${project.version}'>
+        <feature version='${feature.alto.version}'>odl-alto-release</feature>
 <!--
         Commented out, because DIDM brings in Li designed OpenFlowPlugin
         which leads to BindException.