Merge "Keep dns nameserver order consistency"

author Jenkins <jenkins@review.openstack.org>

Fri, 31 Jul 2015 04:43:24 +0000 (04:43 +0000)

committer Gerrit Code Review <review@openstack.org>

Fri, 31 Jul 2015 04:43:24 +0000 (04:43 +0000)
author Jenkins <jenkins@review.openstack.org>
Fri, 31 Jul 2015 04:43:24 +0000 (04:43 +0000)
committer Gerrit Code Review <review@openstack.org>
Fri, 31 Jul 2015 04:43:24 +0000 (04:43 +0000)
diff --cc neutron/tests/unit/agent/linux/test_dhcp.py
Simple merge
author	Jenkins <jenkins@review.openstack.org>
	Fri, 31 Jul 2015 04:43:24 +0000 (04:43 +0000)
committer	Gerrit Code Review <review@openstack.org>
	Fri, 31 Jul 2015 04:43:24 +0000 (04:43 +0000)