Merge "Consistently use jsonutils instead of specific implementation"

author Jenkins <jenkins@review.openstack.org>

Sat, 21 Jun 2014 00:20:07 +0000 (00:20 +0000)

committer Gerrit Code Review <review@openstack.org>

Sat, 21 Jun 2014 00:20:07 +0000 (00:20 +0000)
author Jenkins <jenkins@review.openstack.org>
Sat, 21 Jun 2014 00:20:07 +0000 (00:20 +0000)
committer Gerrit Code Review <review@openstack.org>
Sat, 21 Jun 2014 00:20:07 +0000 (00:20 +0000)
diff --cc neutron/plugins/bigswitch/servermanager.py
Simple merge
diff --cc neutron/plugins/vmware/nsxlib/secgroup.py
Simple merge
diff --cc neutron/plugins/vmware/nsxlib/switch.py
Simple merge
author	Jenkins <jenkins@review.openstack.org>
	Sat, 21 Jun 2014 00:20:07 +0000 (00:20 +0000)
committer	Gerrit Code Review <review@openstack.org>
	Sat, 21 Jun 2014 00:20:07 +0000 (00:20 +0000)
		1	2
neutron/plugins/bigswitch/servermanager.py	patch \|	diff1 \|	diff2 \|	blob \| history
neutron/plugins/vmware/nsxlib/secgroup.py	patch \|	diff1 \|	diff2 \|	blob \| history
neutron/plugins/vmware/nsxlib/switch.py	patch \|	diff1 \|	diff2 \|	blob \| history