Merge "LBaaS: throw proper exception on duplicating monitor association"

author Jenkins <jenkins@review.openstack.org>

Thu, 15 Aug 2013 06:26:49 +0000 (06:26 +0000)

committer Gerrit Code Review <review@openstack.org>

Thu, 15 Aug 2013 06:26:49 +0000 (06:26 +0000)
author Jenkins <jenkins@review.openstack.org>
Thu, 15 Aug 2013 06:26:49 +0000 (06:26 +0000)
committer Gerrit Code Review <review@openstack.org>
Thu, 15 Aug 2013 06:26:49 +0000 (06:26 +0000)
diff --cc neutron/tests/unit/db/loadbalancer/test_db_loadbalancer.py
Simple merge
author	Jenkins <jenkins@review.openstack.org>
	Thu, 15 Aug 2013 06:26:49 +0000 (06:26 +0000)
committer	Gerrit Code Review <review@openstack.org>
	Thu, 15 Aug 2013 06:26:49 +0000 (06:26 +0000)