Merge "Handle attachment of second volume"

author Jenkins <jenkins@review.openstack.org>

Mon, 7 Sep 2015 20:40:13 +0000 (20:40 +0000)

committer Gerrit Code Review <review@openstack.org>

Mon, 7 Sep 2015 20:40:13 +0000 (20:40 +0000)
author Jenkins <jenkins@review.openstack.org>
Mon, 7 Sep 2015 20:40:13 +0000 (20:40 +0000)
committer Gerrit Code Review <review@openstack.org>
Mon, 7 Sep 2015 20:40:13 +0000 (20:40 +0000)
diff --cc cinder/tests/unit/zonemanager/test_brcd_fc_zone_client_cli.py
Simple merge
author	Jenkins <jenkins@review.openstack.org>
	Mon, 7 Sep 2015 20:40:13 +0000 (20:40 +0000)
committer	Gerrit Code Review <review@openstack.org>
	Mon, 7 Sep 2015 20:40:13 +0000 (20:40 +0000)