Merge "Remove useless lb-agent remove_empty_bridges"

author Jenkins <jenkins@review.openstack.org>

Tue, 8 Dec 2015 02:43:31 +0000 (02:43 +0000)

committer Gerrit Code Review <review@openstack.org>

Tue, 8 Dec 2015 02:43:31 +0000 (02:43 +0000)
author Jenkins <jenkins@review.openstack.org>
Tue, 8 Dec 2015 02:43:31 +0000 (02:43 +0000)
committer Gerrit Code Review <review@openstack.org>
Tue, 8 Dec 2015 02:43:31 +0000 (02:43 +0000)
diff --cc neutron/plugins/ml2/drivers/linuxbridge/agent/linuxbridge_neutron_agent.py
Simple merge
diff --cc neutron/tests/unit/plugins/ml2/drivers/linuxbridge/agent/test_linuxbridge_neutron_agent.py
Simple merge
author	Jenkins <jenkins@review.openstack.org>
	Tue, 8 Dec 2015 02:43:31 +0000 (02:43 +0000)
committer	Gerrit Code Review <review@openstack.org>
	Tue, 8 Dec 2015 02:43:31 +0000 (02:43 +0000)
		1	2
neutron/plugins/ml2/drivers/linuxbridge/agent/linuxbridge_neutron_agent.py	patch \|	diff1 \|	diff2 \|	blob \| history
neutron/tests/unit/plugins/ml2/drivers/linuxbridge/agent/test_linuxbridge_neutron_agent.py	patch \|	diff1 \|	diff2 \|	blob \| history