Merge "Port image_utils to Python 3"

author Jenkins <jenkins@review.openstack.org>

Fri, 25 Sep 2015 17:02:30 +0000 (17:02 +0000)

committer Gerrit Code Review <review@openstack.org>

Fri, 25 Sep 2015 17:02:30 +0000 (17:02 +0000)
author Jenkins <jenkins@review.openstack.org>
Fri, 25 Sep 2015 17:02:30 +0000 (17:02 +0000)
committer Gerrit Code Review <review@openstack.org>
Fri, 25 Sep 2015 17:02:30 +0000 (17:02 +0000)
diff --cc cinder/image/image_utils.py
Simple merge
diff --cc tox.ini
Simple merge
author	Jenkins <jenkins@review.openstack.org>
	Fri, 25 Sep 2015 17:02:30 +0000 (17:02 +0000)
committer	Gerrit Code Review <review@openstack.org>
	Fri, 25 Sep 2015 17:02:30 +0000 (17:02 +0000)
		1	2
cinder/image/image_utils.py	patch \|	diff1 \|	diff2 \|	blob \| history
tox.ini	patch \|	diff1 \|	diff2 \|	blob \| history