X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=features-index%2Fsrc%2Fmain%2Fresources%2Ffeatures.xml;h=3bcc5db6d027d999b717b7d47646c07d9990a845;hb=b3c05da7941382b82513b5f0e2b88da4d8bb6bf2;hp=7e277a0e433d9f28eed2204932bf67a56e0e9f74;hpb=11c069001de15e157e43b51658ce6e524ad98bff;p=integration%2Fdistribution.git

diff --git a/features-index/src/main/resources/features.xml b/features-index/src/main/resources/features.xml
index 7e277a0e..3bcc5db6 100644
--- a/features-index/src/main/resources/features.xml
+++ b/features-index/src/main/resources/features.xml
@@ -65,13 +65,17 @@
     <repository>mvn:org.opendaylight.netide/netide-features/${feature.netide.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.netvirt/features-netvirt/${feature.netvirt.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.netvirt/openstack.net-virt-sfc-features/${feature.netvirt.version}/xml/features</repository>
+    <!-- Depends on NIC, which is commented-out.
     <repository>mvn:org.opendaylight.netvirt/vpnservice-features/${feature.netvirt.vpnservice.version}/xml/features</repository>
+    -->
     <repository>mvn:org.opendaylight.neutron/features-neutron/${feature.neutron.version}/xml/features</repository>
+    <!-- NIC merge jobs are failing due to getTableFeatures() method not being supported by OpenFlowPlugin anymore
     <repository>mvn:org.opendaylight.nic/features-nic/${feature.nic.version}/xml/features</repository>
+    -->
     <repository>mvn:org.opendaylight.ocpplugin/features-ocpplugin/${feature.ocpplugin.version}/xml/features</repository>
-<!-- Issue with of-config merge requires this line commented out:
+    <!-- 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-li/${feature.openflowplugin.version}/xml/features</repository>