Merge "NSX: properly handle floating ip status"

author Jenkins <jenkins@review.openstack.org>

Mon, 7 Jul 2014 21:05:41 +0000 (21:05 +0000)

committer Gerrit Code Review <review@openstack.org>

Mon, 7 Jul 2014 21:05:41 +0000 (21:05 +0000)
author Jenkins <jenkins@review.openstack.org>
Mon, 7 Jul 2014 21:05:41 +0000 (21:05 +0000)
committer Gerrit Code Review <review@openstack.org>
Mon, 7 Jul 2014 21:05:41 +0000 (21:05 +0000)
diff --cc neutron/plugins/vmware/plugins/base.py
Simple merge
diff --cc neutron/plugins/vmware/plugins/service.py
Simple merge
diff --cc neutron/tests/unit/vmware/test_nsx_plugin.py
Simple merge
author	Jenkins <jenkins@review.openstack.org>
	Mon, 7 Jul 2014 21:05:41 +0000 (21:05 +0000)
committer	Gerrit Code Review <review@openstack.org>
	Mon, 7 Jul 2014 21:05:41 +0000 (21:05 +0000)
		1	2
neutron/plugins/vmware/plugins/base.py	patch \|	diff1 \|	diff2 \|	blob \| history
neutron/plugins/vmware/plugins/service.py	patch \|	diff1 \|	diff2 \|	blob \| history
neutron/tests/unit/vmware/test_nsx_plugin.py	patch \|	diff1 \|	diff2 \|	blob \| history