Merge "changes ovs agent_id init to use hostname instead of mac"

author Jenkins <jenkins@review.openstack.org>

Mon, 23 Jun 2014 18:38:53 +0000 (18:38 +0000)

committer Gerrit Code Review <review@openstack.org>

Mon, 23 Jun 2014 18:38:53 +0000 (18:38 +0000)
author Jenkins <jenkins@review.openstack.org>
Mon, 23 Jun 2014 18:38:53 +0000 (18:38 +0000)
committer Gerrit Code Review <review@openstack.org>
Mon, 23 Jun 2014 18:38:53 +0000 (18:38 +0000)
diff --cc neutron/plugins/openvswitch/agent/ovs_neutron_agent.py
Simple merge
diff --cc neutron/tests/unit/openvswitch/test_ovs_tunnel.py
Simple merge
author	Jenkins <jenkins@review.openstack.org>
	Mon, 23 Jun 2014 18:38:53 +0000 (18:38 +0000)
committer	Gerrit Code Review <review@openstack.org>
	Mon, 23 Jun 2014 18:38:53 +0000 (18:38 +0000)
		1	2
neutron/plugins/openvswitch/agent/ovs_neutron_agent.py	patch \|	diff1 \|	diff2 \|	blob \| history
neutron/tests/unit/openvswitch/test_ovs_tunnel.py	patch \|	diff1 \|	diff2 \|	blob \| history