Merge "LBaaS: fix handling pending create/update members and health monitors"

author Jenkins <jenkins@review.openstack.org>

Thu, 6 Feb 2014 14:59:31 +0000 (14:59 +0000)

committer Gerrit Code Review <review@openstack.org>

Thu, 6 Feb 2014 14:59:31 +0000 (14:59 +0000)
author Jenkins <jenkins@review.openstack.org>
Thu, 6 Feb 2014 14:59:31 +0000 (14:59 +0000)
committer Gerrit Code Review <review@openstack.org>
Thu, 6 Feb 2014 14:59:31 +0000 (14:59 +0000)
diff --cc neutron/plugins/common/constants.py
Simple merge
diff --cc neutron/services/loadbalancer/drivers/haproxy/namespace_driver.py
Simple merge
diff --cc neutron/services/loadbalancer/drivers/haproxy/plugin_driver.py
Simple merge
diff --cc neutron/tests/unit/services/loadbalancer/drivers/haproxy/test_plugin_driver.py
Simple merge
author	Jenkins <jenkins@review.openstack.org>
	Thu, 6 Feb 2014 14:59:31 +0000 (14:59 +0000)
committer	Gerrit Code Review <review@openstack.org>
	Thu, 6 Feb 2014 14:59:31 +0000 (14:59 +0000)
		1	2
neutron/plugins/common/constants.py	patch \|	diff1 \|	diff2 \|	blob \| history
neutron/services/loadbalancer/drivers/haproxy/namespace_driver.py	patch \|	diff1 \|	diff2 \|	blob \| history
neutron/services/loadbalancer/drivers/haproxy/plugin_driver.py	patch \|	diff1 \|	diff2 \|	blob \| history
neutron/tests/unit/services/loadbalancer/drivers/haproxy/test_plugin_driver.py	patch \|	diff1 \|	diff2 \|	blob \| history