Merge "Allow nicira plugin to handle multiple NVP API versions"

author Jenkins <jenkins@review.openstack.org>

Sun, 17 Feb 2013 02:32:07 +0000 (02:32 +0000)

committer Gerrit Code Review <review@openstack.org>

Sun, 17 Feb 2013 02:32:07 +0000 (02:32 +0000)
author Jenkins <jenkins@review.openstack.org>
Sun, 17 Feb 2013 02:32:07 +0000 (02:32 +0000)
committer Gerrit Code Review <review@openstack.org>
Sun, 17 Feb 2013 02:32:07 +0000 (02:32 +0000)
diff --cc quantum/plugins/nicira/nicira_nvp_plugin/QuantumPlugin.py
Simple merge
diff --cc quantum/plugins/nicira/nicira_nvp_plugin/nvplib.py
Simple merge
diff --cc quantum/tests/unit/nicira/test_nicira_plugin.py
Simple merge
author	Jenkins <jenkins@review.openstack.org>
	Sun, 17 Feb 2013 02:32:07 +0000 (02:32 +0000)
committer	Gerrit Code Review <review@openstack.org>
	Sun, 17 Feb 2013 02:32:07 +0000 (02:32 +0000)
		1	2
quantum/plugins/nicira/nicira_nvp_plugin/QuantumPlugin.py	patch \|	diff1 \|	diff2 \|	blob \| history
quantum/plugins/nicira/nicira_nvp_plugin/nvplib.py	patch \|	diff1 \|	diff2 \|	blob \| history
quantum/tests/unit/nicira/test_nicira_plugin.py	patch \|	diff1 \|	diff2 \|	blob \| history