From 11c069001de15e157e43b51658ce6e524ad98bff Mon Sep 17 00:00:00 2001
From: Luis Gomez <ecelgp@gmail.com>
Date: Tue, 17 May 2016 19:41:59 -0700
Subject: [PATCH] Remove iotdm feature from distribution test

Recent HTTP port conflict detected by distribution-check.

Change-Id: Ibb12953b96a2b3ccd80d095ac427dbbe14a242d1
Signed-off-by: Luis Gomez <ecelgp@gmail.com>
---
 features-test/src/main/resources/features.xml | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/features-test/src/main/resources/features.xml b/features-test/src/main/resources/features.xml
index 04a79f56..e0dcd2a1 100644
--- a/features-test/src/main/resources/features.xml
+++ b/features-test/src/main/resources/features.xml
@@ -141,15 +141,15 @@
         which leads to BindException.
         <feature version='${didm.version}'>odl-didm-all</feature>
 -->
-        <!-- FAAS has disabled odl-faas-all feature due to timeouts in SingleFeatureTest
-        <feature version='${feature.faas.version}'>odl-faas-all</feature>
-        -->
         <feature version='${feature.faas.version}'>odl-faas-base</feature>
         <feature version='${feature.groupbasedpolicy.version}'>odl-groupbasedpolicy-ofoverlay</feature>
         <feature version='${feature.groupbasedpolicy.version}'>odl-groupbasedpolicy-neutronmapper</feature>
         <feature version='${feature.groupbasedpolicy.version}'>odl-groupbasedpolicy-ui</feature>
         <feature version='${project.version}'>odl-integration-compatible-with-all</feature>
+<!--
+        commenting this feature because issue with Jetty server
         <feature version='${feature.iotdm.version}'>odl-iotdm-onem2m</feature>
+-->
         <feature version='${feature.l2switch.version}'>odl-l2switch-switch</feature>
         <feature version='${feature.l2switch.version}'>odl-l2switch-switch-rest</feature>
         <feature version='${feature.l2switch.version}'>odl-l2switch-switch-ui</feature>
@@ -157,9 +157,7 @@
         Commented out, because LACP brings in Li designed OpenFlowPlugin
         which leads to BindException.
         <feature version='${feature.lacp.version}'>odl-lacp-ui</feature>
--->
         <feature version='${feature.netvirt.vpnservice.version}'>odl-netvirt-vpnservice-openstack</feature>
-<!--
         Commented out, because NIC brings in Li designed OpenFlowPlugin
         which leads to BindException.
         <feature version='${feature.nic.version}'>odl-nic-core-mdsal</feature>
-- 
2.36.6