Merge "Fix a race condition adding a security group rule"

author Jenkins <jenkins@review.openstack.org>

Thu, 20 Nov 2014 07:55:39 +0000 (07:55 +0000)

committer Gerrit Code Review <review@openstack.org>

Thu, 20 Nov 2014 07:55:40 +0000 (07:55 +0000)
author Jenkins <jenkins@review.openstack.org>
Thu, 20 Nov 2014 07:55:39 +0000 (07:55 +0000)
committer Gerrit Code Review <review@openstack.org>
Thu, 20 Nov 2014 07:55:40 +0000 (07:55 +0000)
diff --cc neutron/tests/unit/test_security_groups_rpc.py
Simple merge
author	Jenkins <jenkins@review.openstack.org>
	Thu, 20 Nov 2014 07:55:39 +0000 (07:55 +0000)
committer	Gerrit Code Review <review@openstack.org>
	Thu, 20 Nov 2014 07:55:40 +0000 (07:55 +0000)