From: Luis Gomez <ecelgp@gmail.com>
Date: Wed, 3 Aug 2016 01:56:58 +0000 (-0700)
Subject: Change of-config feature to not-compatible
X-Git-Tag: release/boron~12
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=971be2efa1cc3745f2319d7a588ed5399833bc1f;hp=44e45d3e84c9c64ccf692ccd36de9826a88e2b06;p=integration%2Fdistribution.git

Change of-config feature to not-compatible

It has been observed it interferes with ovsdb plugin application.

Change-Id: I60e9bcb6d5e4c478f1ae09774eb7ae9e935040f8
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 7a3f35c6..84028d28 100644
--- a/features-test/src/main/resources/features.xml
+++ b/features-test/src/main/resources/features.xml
@@ -100,7 +100,6 @@
         <feature version='${feature.netide.version}'>odl-netide-app</feature>
         -->
         <feature version='${feature.ocpplugin.version}'>odl-ocpplugin-all</feature>
-        <feature version='${feature.of-config.version}'>odl-of-config-all</feature>
         <feature version='${feature.openflowplugin.version}'>odl-openflowplugin-flow-services</feature>
         <feature version='${feature.openflowplugin.version}'>odl-openflowplugin-flow-services-rest</feature>
         <feature version='${feature.openflowplugin.version}'>odl-openflowplugin-flow-services-ui</feature>
@@ -173,6 +172,7 @@
         -->
         <feature version='${feature.netvirt.version}'>odl-ovsdb-openstack</feature>
         <feature version='${feature.netvirt.version}'>odl-ovsdb-sfc</feature>
+        <feature version='${feature.of-config.version}'>odl-of-config-all</feature>
         <feature version='${feature.snbi.version}'>odl-snbi-all</feature>
         <feature version='${feature.sfc.version}'>odl-sfc-ios-xe-renderer</feature>
         <feature version='${feature.sfc.version}'>odl-sfc-openflow-renderer</feature>