Merge "add router_id to response for CRU on fw/vip objs"

author Jenkins <jenkins@review.openstack.org>

Sun, 23 Feb 2014 17:13:21 +0000 (17:13 +0000)

committer Gerrit Code Review <review@openstack.org>

Sun, 23 Feb 2014 17:13:21 +0000 (17:13 +0000)
author Jenkins <jenkins@review.openstack.org>
Sun, 23 Feb 2014 17:13:21 +0000 (17:13 +0000)
committer Gerrit Code Review <review@openstack.org>
Sun, 23 Feb 2014 17:13:21 +0000 (17:13 +0000)
diff --cc neutron/plugins/nicira/NeutronServicePlugin.py
Simple merge
diff --cc neutron/tests/unit/db/loadbalancer/test_db_loadbalancer.py
Simple merge
author	Jenkins <jenkins@review.openstack.org>
	Sun, 23 Feb 2014 17:13:21 +0000 (17:13 +0000)
committer	Gerrit Code Review <review@openstack.org>
	Sun, 23 Feb 2014 17:13:21 +0000 (17:13 +0000)
		1	2
neutron/plugins/nicira/NeutronServicePlugin.py	patch \|	diff1 \|	diff2 \|	blob \| history
neutron/tests/unit/db/loadbalancer/test_db_loadbalancer.py	patch \|	diff1 \|	diff2 \|	blob \| history