Merge "Bug 5936 - DeviceFlowRegistry flowId bug"

author Jozef Bacigal <jbacigal@cisco.com>

Tue, 28 Jun 2016 08:40:29 +0000 (08:40 +0000)

committer Gerrit Code Review <gerrit@opendaylight.org>

Tue, 28 Jun 2016 08:40:29 +0000 (08:40 +0000)
author Jozef Bacigal <jbacigal@cisco.com>
Tue, 28 Jun 2016 08:40:29 +0000 (08:40 +0000)
committer Gerrit Code Review <gerrit@opendaylight.org>
Tue, 28 Jun 2016 08:40:29 +0000 (08:40 +0000)
diff --cc openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/device/DeviceContextImpl.java
Simple merge
author	Jozef Bacigal <jbacigal@cisco.com>
	Tue, 28 Jun 2016 08:40:29 +0000 (08:40 +0000)
committer	Gerrit Code Review <gerrit@opendaylight.org>
	Tue, 28 Jun 2016 08:40:29 +0000 (08:40 +0000)