]> review.fuel-infra Code Review - openstack-build/cinder-build.git/commit
Fix a merge problem in VMAX driver
authorXing Yang <xing.yang@emc.com>
Fri, 28 Aug 2015 18:56:13 +0000 (14:56 -0400)
committerJohn Griffith <john.griffith8@gmail.com>
Mon, 31 Aug 2015 20:51:37 +0000 (20:51 +0000)
commitabc6abb1738a8ade607467397751571a30d0e6f5
treeb4a63597ca1599b9c6fa7f704760418cf9a07ccc
parentd8137f3b9178420184830fff6e90a805c0a51fad
Fix a merge problem in VMAX driver

SMI-S v8.0.3 support was added to VMAX driver, but some of the
code was merged out. This patch adds them back.

(Pulled from gate, cinder can no longer pass unit tests)

Change-Id: Ie2cd2ba12d72d27e6ea71de86911cfca83d105c0
Closes-Bug: #1487616
cinder/tests/unit/test_emc_vmax.py
cinder/volume/drivers/emc/emc_vmax_common.py
cinder/volume/drivers/emc/emc_vmax_https.py
cinder/volume/drivers/emc/emc_vmax_provision.py
cinder/volume/drivers/emc/emc_vmax_utils.py