Merge "Fix Python 3 issues in Hitachi HNAS tests"

author Jenkins <jenkins@review.openstack.org>

Mon, 10 Aug 2015 01:04:00 +0000 (01:04 +0000)

committer Gerrit Code Review <review@openstack.org>

Mon, 10 Aug 2015 01:04:00 +0000 (01:04 +0000)
author Jenkins <jenkins@review.openstack.org>
Mon, 10 Aug 2015 01:04:00 +0000 (01:04 +0000)
committer Gerrit Code Review <review@openstack.org>
Mon, 10 Aug 2015 01:04:00 +0000 (01:04 +0000)
diff --cc cinder/tests/unit/test_hitachi_hnas_backend.py
Simple merge
diff --cc cinder/tests/unit/test_hitachi_hnas_iscsi.py
Simple merge
diff --cc tox.ini
Simple merge
author	Jenkins <jenkins@review.openstack.org>
	Mon, 10 Aug 2015 01:04:00 +0000 (01:04 +0000)
committer	Gerrit Code Review <review@openstack.org>
	Mon, 10 Aug 2015 01:04:00 +0000 (01:04 +0000)
		1	2
cinder/tests/unit/test_hitachi_hnas_backend.py	patch \|	diff1 \|	diff2 \|	blob \| history
cinder/tests/unit/test_hitachi_hnas_iscsi.py	patch \|	diff1 \|	diff2 \|	blob \| history
tox.ini	patch \|	diff1 \|	diff2 \|	blob \| history