Merge "BUG:5128 Elan Multi-DPN datapath fix" into stable/beryllium

author Vivek Srivastava <vivek.v.srivastava@ericsson.com>

Mon, 8 Feb 2016 05:38:49 +0000 (05:38 +0000)

committer Gerrit Code Review <gerrit@opendaylight.org>

Mon, 8 Feb 2016 05:38:49 +0000 (05:38 +0000)
author Vivek Srivastava <vivek.v.srivastava@ericsson.com>
Mon, 8 Feb 2016 05:38:49 +0000 (05:38 +0000)
committer Gerrit Code Review <gerrit@opendaylight.org>
Mon, 8 Feb 2016 05:38:49 +0000 (05:38 +0000)
diff --cc interfacemgr/interfacemgr-impl/src/main/java/org/opendaylight/vpnservice/interfacemgr/IfmUtil.java
Simple merge
diff --cc interfacemgr/interfacemgr-impl/src/main/java/org/opendaylight/vpnservice/interfacemgr/rpcservice/InterfaceManagerRpcService.java
Simple merge
author	Vivek Srivastava <vivek.v.srivastava@ericsson.com>
	Mon, 8 Feb 2016 05:38:49 +0000 (05:38 +0000)
committer	Gerrit Code Review <gerrit@opendaylight.org>
	Mon, 8 Feb 2016 05:38:49 +0000 (05:38 +0000)
		1	2
interfacemgr/interfacemgr-impl/src/main/java/org/opendaylight/vpnservice/interfacemgr/IfmUtil.java	patch \|	diff1 \|	diff2 \|	blob \| history
interfacemgr/interfacemgr-impl/src/main/java/org/opendaylight/vpnservice/interfacemgr/rpcservice/InterfaceManagerRpcService.java	patch \|	diff1 \|	diff2 \|	blob \| history