Merge "Fixes Tempest XML test failures for Cisco N1kv plugin"

author Jenkins <jenkins@review.openstack.org>

Wed, 26 Feb 2014 02:15:38 +0000 (02:15 +0000)

committer Gerrit Code Review <review@openstack.org>

Wed, 26 Feb 2014 02:15:38 +0000 (02:15 +0000)
author Jenkins <jenkins@review.openstack.org>
Wed, 26 Feb 2014 02:15:38 +0000 (02:15 +0000)
committer Gerrit Code Review <review@openstack.org>
Wed, 26 Feb 2014 02:15:38 +0000 (02:15 +0000)
diff --cc neutron/plugins/cisco/n1kv/n1kv_client.py
Simple merge
diff --cc neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py
Simple merge
diff --cc neutron/tests/unit/cisco/n1kv/test_n1kv_plugin.py
Simple merge
author	Jenkins <jenkins@review.openstack.org>
	Wed, 26 Feb 2014 02:15:38 +0000 (02:15 +0000)
committer	Gerrit Code Review <review@openstack.org>
	Wed, 26 Feb 2014 02:15:38 +0000 (02:15 +0000)
		1	2
neutron/plugins/cisco/n1kv/n1kv_client.py	patch \|	diff1 \|	diff2 \|	blob \| history
neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py	patch \|	diff1 \|	diff2 \|	blob \| history
neutron/tests/unit/cisco/n1kv/test_n1kv_plugin.py	patch \|	diff1 \|	diff2 \|	blob \| history