Merge "Log a warning if dnsmasq version is below the minimum required"

author Jenkins <jenkins@review.openstack.org>

Fri, 10 May 2013 12:40:37 +0000 (12:40 +0000)

committer Gerrit Code Review <review@openstack.org>

Fri, 10 May 2013 12:40:37 +0000 (12:40 +0000)
author Jenkins <jenkins@review.openstack.org>
Fri, 10 May 2013 12:40:37 +0000 (12:40 +0000)
committer Gerrit Code Review <review@openstack.org>
Fri, 10 May 2013 12:40:37 +0000 (12:40 +0000)
diff --cc etc/quantum/rootwrap.d/dhcp.filters
Simple merge
diff --cc quantum/agent/dhcp_agent.py
Simple merge
diff --cc quantum/rootwrap/filters.py
Simple merge
author	Jenkins <jenkins@review.openstack.org>
	Fri, 10 May 2013 12:40:37 +0000 (12:40 +0000)
committer	Gerrit Code Review <review@openstack.org>
	Fri, 10 May 2013 12:40:37 +0000 (12:40 +0000)
		1	2
etc/quantum/rootwrap.d/dhcp.filters	patch \|	diff1 \|	diff2 \|	blob \| history
quantum/agent/dhcp_agent.py	patch \|	diff1 \|	diff2 \|	blob \| history
quantum/rootwrap/filters.py	patch \|	diff1 \|	diff2 \|	blob \| history