Merge "Replace urllib.unquote with urllib.parse.unquote"

author Jenkins <jenkins@review.openstack.org>

Thu, 27 Aug 2015 09:35:25 +0000 (09:35 +0000)

committer Gerrit Code Review <review@openstack.org>

Thu, 27 Aug 2015 09:35:25 +0000 (09:35 +0000)
author Jenkins <jenkins@review.openstack.org>
Thu, 27 Aug 2015 09:35:25 +0000 (09:35 +0000)
committer Gerrit Code Review <review@openstack.org>
Thu, 27 Aug 2015 09:35:25 +0000 (09:35 +0000)
diff --cc cinder/tests/unit/test_vmware_volumeops.py
Simple merge
diff --cc cinder/volume/drivers/vmware/volumeops.py
Simple merge
author	Jenkins <jenkins@review.openstack.org>
	Thu, 27 Aug 2015 09:35:25 +0000 (09:35 +0000)
committer	Gerrit Code Review <review@openstack.org>
	Thu, 27 Aug 2015 09:35:25 +0000 (09:35 +0000)
		1	2
cinder/tests/unit/test_vmware_volumeops.py	patch \|	diff1 \|	diff2 \|	blob \| history
cinder/volume/drivers/vmware/volumeops.py	patch \|	diff1 \|	diff2 \|	blob \| history