Merge "i18n Compatibility in VMAX driver"

author Jenkins <jenkins@review.openstack.org>

Tue, 17 Mar 2015 04:26:58 +0000 (04:26 +0000)

committer Gerrit Code Review <review@openstack.org>

Tue, 17 Mar 2015 04:26:58 +0000 (04:26 +0000)
author Jenkins <jenkins@review.openstack.org>
Tue, 17 Mar 2015 04:26:58 +0000 (04:26 +0000)
committer Gerrit Code Review <review@openstack.org>
Tue, 17 Mar 2015 04:26:58 +0000 (04:26 +0000)
diff --cc cinder/volume/drivers/emc/emc_vmax_common.py
Simple merge
diff --cc cinder/volume/drivers/emc/emc_vmax_fast.py
Simple merge
diff --cc cinder/volume/drivers/emc/emc_vmax_https.py
Simple merge
diff --cc cinder/volume/drivers/emc/emc_vmax_provision_v3.py
Simple merge
diff --cc cinder/volume/drivers/emc/emc_vmax_utils.py
Simple merge
author	Jenkins <jenkins@review.openstack.org>
	Tue, 17 Mar 2015 04:26:58 +0000 (04:26 +0000)
committer	Gerrit Code Review <review@openstack.org>
	Tue, 17 Mar 2015 04:26:58 +0000 (04:26 +0000)
		1	2
cinder/volume/drivers/emc/emc_vmax_common.py	patch \|	diff1 \|	diff2 \|	blob \| history
cinder/volume/drivers/emc/emc_vmax_fast.py	patch \|	diff1 \|	diff2 \|	blob \| history
cinder/volume/drivers/emc/emc_vmax_https.py	patch \|	diff1 \|	diff2 \|	blob \| history
cinder/volume/drivers/emc/emc_vmax_provision_v3.py	patch \|	diff1 \|	diff2 \|	blob \| history
cinder/volume/drivers/emc/emc_vmax_utils.py	patch \|	diff1 \|	diff2 \|	blob \| history