Merge "rename ACTIVE_PENDING to ACTIVE_PENDING_STATUSES"

author Jenkins <jenkins@review.openstack.org>

Sun, 23 Mar 2014 00:26:06 +0000 (00:26 +0000)

committer Gerrit Code Review <review@openstack.org>

Sun, 23 Mar 2014 00:26:06 +0000 (00:26 +0000)
author Jenkins <jenkins@review.openstack.org>
Sun, 23 Mar 2014 00:26:06 +0000 (00:26 +0000)
committer Gerrit Code Review <review@openstack.org>
Sun, 23 Mar 2014 00:26:06 +0000 (00:26 +0000)
diff --cc neutron/services/loadbalancer/drivers/common/agent_driver_base.py
Simple merge
diff --cc neutron/services/loadbalancer/drivers/haproxy/cfg.py
Simple merge
author	Jenkins <jenkins@review.openstack.org>
	Sun, 23 Mar 2014 00:26:06 +0000 (00:26 +0000)
committer	Gerrit Code Review <review@openstack.org>
	Sun, 23 Mar 2014 00:26:06 +0000 (00:26 +0000)
		1	2
neutron/services/loadbalancer/drivers/common/agent_driver_base.py	patch \|	diff1 \|	diff2 \|	blob \| history
neutron/services/loadbalancer/drivers/haproxy/cfg.py	patch \|	diff1 \|	diff2 \|	blob \| history