Merge "Fix manage_existing function in infortrend driver"

author Jenkins <jenkins@review.openstack.org>

Mon, 29 Jun 2015 04:21:21 +0000 (04:21 +0000)

committer Gerrit Code Review <review@openstack.org>

Mon, 29 Jun 2015 04:21:21 +0000 (04:21 +0000)
author Jenkins <jenkins@review.openstack.org>
Mon, 29 Jun 2015 04:21:21 +0000 (04:21 +0000)
committer Gerrit Code Review <review@openstack.org>
Mon, 29 Jun 2015 04:21:21 +0000 (04:21 +0000)
diff --cc cinder/tests/unit/test_infortrend_common.py
Simple merge
diff --cc cinder/volume/drivers/infortrend/eonstor_ds_cli/common_cli.py
Simple merge
author	Jenkins <jenkins@review.openstack.org>
	Mon, 29 Jun 2015 04:21:21 +0000 (04:21 +0000)
committer	Gerrit Code Review <review@openstack.org>
	Mon, 29 Jun 2015 04:21:21 +0000 (04:21 +0000)
		1	2
cinder/tests/unit/test_infortrend_common.py	patch \|	diff1 \|	diff2 \|	blob \| history
cinder/volume/drivers/infortrend/eonstor_ds_cli/common_cli.py	patch \|	diff1 \|	diff2 \|	blob \| history