Merge "Add InvalidExternalNetwork exception to display correct error"

author Jenkins <jenkins@review.openstack.org>

Mon, 3 Jun 2013 20:31:04 +0000 (20:31 +0000)

committer Gerrit Code Review <review@openstack.org>

Mon, 3 Jun 2013 20:31:04 +0000 (20:31 +0000)
author Jenkins <jenkins@review.openstack.org>
Mon, 3 Jun 2013 20:31:04 +0000 (20:31 +0000)
committer Gerrit Code Review <review@openstack.org>
Mon, 3 Jun 2013 20:31:04 +0000 (20:31 +0000)
diff --cc quantum/db/l3_db.py
Simple merge
diff --cc quantum/tests/unit/nicira/test_nicira_plugin.py
Simple merge
diff --cc quantum/tests/unit/test_l3_plugin.py
Simple merge
author	Jenkins <jenkins@review.openstack.org>
	Mon, 3 Jun 2013 20:31:04 +0000 (20:31 +0000)
committer	Gerrit Code Review <review@openstack.org>
	Mon, 3 Jun 2013 20:31:04 +0000 (20:31 +0000)
		1	2
quantum/db/l3_db.py	patch \|	diff1 \|	diff2 \|	blob \| history
quantum/tests/unit/nicira/test_nicira_plugin.py	patch \|	diff1 \|	diff2 \|	blob \| history
quantum/tests/unit/test_l3_plugin.py	patch \|	diff1 \|	diff2 \|	blob \| history