Merge "Bug 4733 - impl/SecurityServicesImpl.java: null pointer exception"

author Sam Hague <shague@redhat.com>

Wed, 9 Dec 2015 21:13:06 +0000 (21:13 +0000)

committer Gerrit Code Review <gerrit@opendaylight.org>

Wed, 9 Dec 2015 21:13:06 +0000 (21:13 +0000)
author Sam Hague <shague@redhat.com>
Wed, 9 Dec 2015 21:13:06 +0000 (21:13 +0000)
committer Gerrit Code Review <gerrit@opendaylight.org>
Wed, 9 Dec 2015 21:13:06 +0000 (21:13 +0000)
diff --cc openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/impl/SecurityGroupCacheManagerImpl.java
Simple merge
diff --cc openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/impl/SecurityServicesImpl.java
Simple merge
author	Sam Hague <shague@redhat.com>
	Wed, 9 Dec 2015 21:13:06 +0000 (21:13 +0000)
committer	Gerrit Code Review <gerrit@opendaylight.org>
	Wed, 9 Dec 2015 21:13:06 +0000 (21:13 +0000)
		1	2
openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/impl/SecurityGroupCacheManagerImpl.java	patch \|	diff1 \|	diff2 \|	blob \| history
openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/impl/SecurityServicesImpl.java	patch \|	diff1 \|	diff2 \|	blob \| history