From: Vratko Polak <vrpolak@cisco.com>
Date: Tue, 12 Jan 2016 18:58:03 +0000 (+0100)
Subject: Comment LACP feature out due to bringing in OFP-Li
X-Git-Tag: release/boron~83
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=integration%2Fdistribution.git;a=commitdiff_plain;h=bc80de1d83ff5d41d3f3989d2a7b4c798d286d54

Comment LACP feature out due to bringing in OFP-Li

Change-Id: Ide3b72f5d0e3957701a8efd1ed3e3d0c8ab203dd
Signed-off-by: Vratko Polak <vrpolak@cisco.com>
---

diff --git a/features-test/src/main/resources/features.xml b/features-test/src/main/resources/features.xml
index 68d9dedd..02848e8f 100644
--- a/features-test/src/main/resources/features.xml
+++ b/features-test/src/main/resources/features.xml
@@ -158,7 +158,11 @@
         <feature version='0.4.0-SNAPSHOT'>odl-l2switch-switch</feature>
         <feature version='0.4.0-SNAPSHOT'>odl-l2switch-switch-rest</feature>
         <feature version='0.4.0-SNAPSHOT'>odl-l2switch-switch-ui</feature>
+<!--
+        Commented out, because LACP brings in Li designed OpenFlowPlugin
+        which leads to BindException.
         <feature version='${feature.lacp.version}'>odl-lacp-ui</feature>
+-->
 <!--
         Commented out, because NIC brings in Li designed OpenFlowPlugin
         which leads to BindException.