Merge "Port location tracking for BigSwitch Plugin"

author Jenkins <jenkins@review.openstack.org>

Fri, 28 Jun 2013 11:01:42 +0000 (11:01 +0000)

committer Gerrit Code Review <review@openstack.org>

Fri, 28 Jun 2013 11:01:42 +0000 (11:01 +0000)
author Jenkins <jenkins@review.openstack.org>
Fri, 28 Jun 2013 11:01:42 +0000 (11:01 +0000)
committer Gerrit Code Review <review@openstack.org>
Fri, 28 Jun 2013 11:01:42 +0000 (11:01 +0000)
diff --cc etc/quantum/plugins/bigswitch/restproxy.ini
Simple merge
diff --cc quantum/tests/unit/bigswitch/etc/restproxy.ini.test
Simple merge
author	Jenkins <jenkins@review.openstack.org>
	Fri, 28 Jun 2013 11:01:42 +0000 (11:01 +0000)
committer	Gerrit Code Review <review@openstack.org>
	Fri, 28 Jun 2013 11:01:42 +0000 (11:01 +0000)
		1	2
etc/quantum/plugins/bigswitch/restproxy.ini	patch \|	diff1 \|	diff2 \|	blob \| history
quantum/tests/unit/bigswitch/etc/restproxy.ini.test	patch \|	diff1 \|	diff2 \|	blob \| history