Cherry pick https://git.opendaylight.org/gerrit/#/c/33436/ to master
Change-Id: I31608b39d14efd9e2f192cfe38e2c33cfdd5ba84
Signed-off-by: Luis Gomez <ecelgp@gmail.com>
<feature version='${feature.usc.version}'>odl-usc-channel-ui</feature>
<feature version='${feature.usecplugin.version}'>odl-usecplugin-api</feature>
<feature version='${feature.usecplugin.version}'>odl-usecplugin</feature>
<feature version='${feature.usc.version}'>odl-usc-channel-ui</feature>
<feature version='${feature.usecplugin.version}'>odl-usecplugin-api</feature>
<feature version='${feature.usecplugin.version}'>odl-usecplugin</feature>
- <feature version='${feature.vpnservice.version}'>odl-vpnservice-core</feature>
</feature>
<!-- Please use aphabetical order for non-compatible features -->
</feature>
<!-- Please use aphabetical order for non-compatible features -->
<feature version='${feature.snbi.version}'>odl-snbi-all</feature>
<feature version='${feature.sfc.version}'>odl-sfcofl2</feature>
<feature version='${feature.tsdr.version}'>odl-tsdr-hsqldb-all</feature>
<feature version='${feature.snbi.version}'>odl-snbi-all</feature>
<feature version='${feature.sfc.version}'>odl-sfcofl2</feature>
<feature version='${feature.tsdr.version}'>odl-tsdr-hsqldb-all</feature>
+ <feature version='${feature.vpnservice.version}'>odl-vpnservice-core</feature>
<feature version='${feature.vpnservice.version}'>odl-vpnservice-openstack</feature>
<feature version='${feature.vtn-manager.version}'>odl-vtn-manager-neutron</feature>
<feature version='${feature.vtn-manager.version}'>odl-vtn-manager-rest</feature>
<feature version='${feature.vpnservice.version}'>odl-vpnservice-openstack</feature>
<feature version='${feature.vtn-manager.version}'>odl-vtn-manager-neutron</feature>
<feature version='${feature.vtn-manager.version}'>odl-vtn-manager-rest</feature>