Merge "Reduce runtime of E-Series iSCSI tests"

author Jenkins <jenkins@review.openstack.org>

Tue, 1 Sep 2015 05:46:58 +0000 (05:46 +0000)

committer Gerrit Code Review <review@openstack.org>

Tue, 1 Sep 2015 05:46:58 +0000 (05:46 +0000)
author Jenkins <jenkins@review.openstack.org>
Tue, 1 Sep 2015 05:46:58 +0000 (05:46 +0000)
committer Gerrit Code Review <review@openstack.org>
Tue, 1 Sep 2015 05:46:58 +0000 (05:46 +0000)
diff --cc cinder/tests/unit/test_netapp_eseries_iscsi.py
Simple merge
author	Jenkins <jenkins@review.openstack.org>
	Tue, 1 Sep 2015 05:46:58 +0000 (05:46 +0000)
committer	Gerrit Code Review <review@openstack.org>
	Tue, 1 Sep 2015 05:46:58 +0000 (05:46 +0000)