Merge "3PAR fix driver to work with image cache"

author Jenkins <jenkins@review.openstack.org>

Thu, 4 Feb 2016 16:55:45 +0000 (16:55 +0000)

committer Gerrit Code Review <review@openstack.org>

Thu, 4 Feb 2016 16:55:45 +0000 (16:55 +0000)
author Jenkins <jenkins@review.openstack.org>
Thu, 4 Feb 2016 16:55:45 +0000 (16:55 +0000)
committer Gerrit Code Review <review@openstack.org>
Thu, 4 Feb 2016 16:55:45 +0000 (16:55 +0000)
diff --cc cinder/volume/drivers/hpe/hpe_3par_common.py
Simple merge
author	Jenkins <jenkins@review.openstack.org>
	Thu, 4 Feb 2016 16:55:45 +0000 (16:55 +0000)
committer	Gerrit Code Review <review@openstack.org>
	Thu, 4 Feb 2016 16:55:45 +0000 (16:55 +0000)