Merge "l2-population/lb/vxlan : ip neigh add command failed"

author Jenkins <jenkins@review.openstack.org>

Sun, 2 Mar 2014 01:25:48 +0000 (01:25 +0000)

committer Gerrit Code Review <review@openstack.org>

Sun, 2 Mar 2014 01:25:48 +0000 (01:25 +0000)
author Jenkins <jenkins@review.openstack.org>
Sun, 2 Mar 2014 01:25:48 +0000 (01:25 +0000)
committer Gerrit Code Review <review@openstack.org>
Sun, 2 Mar 2014 01:25:48 +0000 (01:25 +0000)
diff --cc neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py
Simple merge
diff --cc neutron/tests/unit/linuxbridge/test_lb_neutron_agent.py
Simple merge
author	Jenkins <jenkins@review.openstack.org>
	Sun, 2 Mar 2014 01:25:48 +0000 (01:25 +0000)
committer	Gerrit Code Review <review@openstack.org>
	Sun, 2 Mar 2014 01:25:48 +0000 (01:25 +0000)
		1	2
neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py	patch \|	diff1 \|	diff2 \|	blob \| history
neutron/tests/unit/linuxbridge/test_lb_neutron_agent.py	patch \|	diff1 \|	diff2 \|	blob \| history