Merge "Port zonemanager to Python 3"

author Jenkins <jenkins@review.openstack.org>

Mon, 21 Dec 2015 20:17:20 +0000 (20:17 +0000)

committer Gerrit Code Review <review@openstack.org>

Mon, 21 Dec 2015 20:17:20 +0000 (20:17 +0000)
author Jenkins <jenkins@review.openstack.org>
Mon, 21 Dec 2015 20:17:20 +0000 (20:17 +0000)
committer Gerrit Code Review <review@openstack.org>
Mon, 21 Dec 2015 20:17:20 +0000 (20:17 +0000)
diff --cc cinder/zonemanager/drivers/brocade/brcd_fc_san_lookup_service.py
Simple merge
diff --cc cinder/zonemanager/drivers/cisco/cisco_fc_san_lookup_service.py
Simple merge
diff --cc tests-py3.txt
Simple merge
author	Jenkins <jenkins@review.openstack.org>
	Mon, 21 Dec 2015 20:17:20 +0000 (20:17 +0000)
committer	Gerrit Code Review <review@openstack.org>
	Mon, 21 Dec 2015 20:17:20 +0000 (20:17 +0000)
		1	2
cinder/zonemanager/drivers/brocade/brcd_fc_san_lookup_service.py	patch \|	diff1 \|	diff2 \|	blob \| history
cinder/zonemanager/drivers/cisco/cisco_fc_san_lookup_service.py	patch \|	diff1 \|	diff2 \|	blob \| history
tests-py3.txt	patch \|	diff1 \|	diff2 \|	blob \| history