From a75e11f6a8cf6a7d422f2d1bf0c0010819c2f9d8 Mon Sep 17 00:00:00 2001
From: Freeinggo Sure <xiao.fenggang@zte.com.cn>
Date: Sun, 31 Jul 2016 14:10:57 +0800
Subject: [PATCH] Bug 6287 - OFCONFIG Missing from Distribution Feature Index

Enable of-config features for Integration

Change-Id: I03fa8cb70d878a6d03711ef5031544a12f23e307
Signed-off-by: Freeinggo Sure <xiao.fenggang@zte.com.cn>
---
 features-index/pom.xml                         | 2 --
 features-index/src/main/resources/features.xml | 2 --
 features-test/src/main/resources/features.xml  | 2 --
 3 files changed, 6 deletions(-)

diff --git a/features-index/pom.xml b/features-index/pom.xml
index 613a3dfb..008995ce 100644
--- a/features-index/pom.xml
+++ b/features-index/pom.xml
@@ -344,7 +344,6 @@
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
-        <!-- Issue with of-config merge requires this line commented out:
         <dependency>
             <groupId>org.opendaylight.of-config</groupId>
             <artifactId>features-of-config</artifactId>
@@ -352,7 +351,6 @@
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
-        -->
         <dependency>
             <groupId>org.opendaylight.ofextensions.circuitsw</groupId>
             <artifactId>circuitsw-features</artifactId>
diff --git a/features-index/src/main/resources/features.xml b/features-index/src/main/resources/features.xml
index 3ebf4001..cb889b8b 100644
--- a/features-index/src/main/resources/features.xml
+++ b/features-index/src/main/resources/features.xml
@@ -76,9 +76,7 @@
     <repository>mvn:org.opendaylight.ocpplugin/features-ocpplugin/${feature.ocpplugin.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.odlparent/features-akka/${feature.odlparent.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.odlparent/features-odlparent/${feature.odlparent.version}/xml/features</repository>
-    <!-- Issue with of-config merge requires this line commented out:
     <repository>mvn:org.opendaylight.of-config/features-of-config/${feature.of-config.version}/xml/features</repository>
-    -->
     <repository>mvn:org.opendaylight.ofextensions.circuitsw/circuitsw-features/${feature.circuitsw.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.openflowplugin/features-openflowplugin/${feature.openflowplugin.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.openflowplugin/features-openflowplugin-he/${feature.openflowplugin.version}/xml/features</repository>
diff --git a/features-test/src/main/resources/features.xml b/features-test/src/main/resources/features.xml
index 4cde1cbe..0ee87f30 100644
--- a/features-test/src/main/resources/features.xml
+++ b/features-test/src/main/resources/features.xml
@@ -98,9 +98,7 @@
         <feature version='${feature.netide.version}'>odl-netide-rest</feature>
         <feature version='${feature.netide.version}'>odl-netide-app</feature>
         <feature version='${feature.ocpplugin.version}'>odl-ocpplugin-all</feature>
-        <!-- Issue with of-config merge requires this line commented out
         <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>
-- 
2.36.6