Merge "LBaaS: move agent based driver files into a separate dir"

author Jenkins <jenkins@review.openstack.org>

Fri, 21 Feb 2014 10:55:51 +0000 (10:55 +0000)

committer Gerrit Code Review <review@openstack.org>

Fri, 21 Feb 2014 10:55:51 +0000 (10:55 +0000)
author Jenkins <jenkins@review.openstack.org>
Fri, 21 Feb 2014 10:55:51 +0000 (10:55 +0000)
committer Gerrit Code Review <review@openstack.org>
Fri, 21 Feb 2014 10:55:51 +0000 (10:55 +0000)
diff --cc neutron/services/loadbalancer/drivers/haproxy/namespace_driver.py
Simple merge
diff --cc setup.cfg
Simple merge
author	Jenkins <jenkins@review.openstack.org>
	Fri, 21 Feb 2014 10:55:51 +0000 (10:55 +0000)
committer	Gerrit Code Review <review@openstack.org>
	Fri, 21 Feb 2014 10:55:51 +0000 (10:55 +0000)
		1	2
neutron/services/loadbalancer/drivers/haproxy/namespace_driver.py	patch \|	diff1 \|	diff2 \|	blob \| history
setup.cfg	patch \|	diff1 \|	diff2 \|	blob \| history