fix conflict with netvirt 73/45173/1
authorAlex Feigin <alex.feigin@hpe.com>
Wed, 31 Aug 2016 18:20:02 +0000 (21:20 +0300)
committerAlex Feigin <alex.feigin@hpe.com>
Mon, 5 Sep 2016 16:36:13 +0000 (19:36 +0300)
commit83974a6843a8cf4e5dbae630eda943f361da2f1d
tree18701184d881bb5b665eb7b5a868224c657d2e2b
parentebaa016e4a495b79ee70a5a93c1372af516f7c70
fix conflict with netvirt
fix Bug 6558 - Services created in neutron conflicts with services created in unimgr

Change-Id: Idd1b90027236f24c6b78cc30851e6e036bfd98e9
Signed-off-by: Alex Feigin <alex.feigin@hpe.com>
features/src/main/features/features.xml
netvirt/src/main/java/org/opendaylight/unimgr/mef/netvirt/ElanInterfaceListener.java [new file with mode: 0644]
netvirt/src/main/java/org/opendaylight/unimgr/mef/netvirt/ElanListener.java [new file with mode: 0644]
netvirt/src/main/java/org/opendaylight/unimgr/mef/netvirt/EvcListener.java
netvirt/src/main/java/org/opendaylight/unimgr/mef/netvirt/EvcUniUtils.java
netvirt/src/main/java/org/opendaylight/unimgr/mef/netvirt/MefUtils.java
netvirt/src/main/java/org/opendaylight/unimgr/mef/netvirt/NetvirtUtils.java
netvirt/src/main/java/org/opendaylight/unimgr/mef/netvirt/NodeConnectorListener.java
netvirt/src/main/resources/org/opendaylight/blueprint/netvirt-driver.xml