Merge "DHCP agent: add 'bridged' property to interface driver"

author Jenkins <jenkins@review.openstack.org>

Tue, 1 Sep 2015 02:43:40 +0000 (02:43 +0000)

committer Gerrit Code Review <review@openstack.org>

Tue, 1 Sep 2015 02:43:40 +0000 (02:43 +0000)
author Jenkins <jenkins@review.openstack.org>
Tue, 1 Sep 2015 02:43:40 +0000 (02:43 +0000)
committer Gerrit Code Review <review@openstack.org>
Tue, 1 Sep 2015 02:43:40 +0000 (02:43 +0000)
diff --cc neutron/agent/linux/dhcp.py
Simple merge
diff --cc neutron/agent/linux/interface.py
Simple merge
diff --cc neutron/tests/unit/agent/linux/test_dhcp.py
Simple merge
author	Jenkins <jenkins@review.openstack.org>
	Tue, 1 Sep 2015 02:43:40 +0000 (02:43 +0000)
committer	Gerrit Code Review <review@openstack.org>
	Tue, 1 Sep 2015 02:43:40 +0000 (02:43 +0000)
		1	2
neutron/agent/linux/dhcp.py	patch \|	diff1 \|	diff2 \|	blob \| history
neutron/agent/linux/interface.py	patch \|	diff1 \|	diff2 \|	blob \| history
neutron/tests/unit/agent/linux/test_dhcp.py	patch \|	diff1 \|	diff2 \|	blob \| history