From: Luis Gomez <ecelgp@gmail.com>
Date: Mon, 27 Apr 2015 21:46:32 +0000 (+0000)
Subject: Merge "Adding TSDR features to integration project."
X-Git-Tag: release/lithium-sr2~35
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=81671ee0e267946dd05fc8918af7f971a3252d20;p=integration%2Fdistribution.git

Merge "Adding TSDR features to integration project."
---

81671ee0e267946dd05fc8918af7f971a3252d20
diff --cc features/test/src/main/resources/features.xml
index 0eb976f5,d2c39430..da9fed48
--- a/features/test/src/main/resources/features.xml
+++ b/features/test/src/main/resources/features.xml
@@@ -121,8 -122,8 +121,9 @@@
          <feature version='${feature.ovsdb.openstack.version}'>odl-ovsdb-openstack</feature>
          <!--<feature version='0.1.0-SNAPSHOT'>odl-ovsdb-ovssfc</feature>-->
          <feature version='${feature.snbi.version}'>odl-snbi-all</feature>
+         <feature version='${feature.tsdr.version}'>odl-tsdr-all</feature>
          <feature version='${feature.vtn-manager.version}'>odl-vtn-manager-all</feature>
 +        <feature version='${feature.vpnservice.version}'>odl-vpnservice-core</feature>
      </feature>
  
  </features>