From: Jenkins <jenkins@review.openstack.org>
Date: Mon, 24 Nov 2014 04:58:54 +0000 (+0000)
Subject: Merge "ProphetStor with pool aware cinder scheduler"
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=0c8abb45560b706329576c630bd843edd47962f8;p=openstack-build%2Fcinder-build.git

Merge "ProphetStor with pool aware cinder scheduler"
---

0c8abb45560b706329576c630bd843edd47962f8
diff --cc cinder/volume/drivers/prophetstor/dplcommon.py
index 669c1ba16,d18d53c35..e719de1a6
--- a/cinder/volume/drivers/prophetstor/dplcommon.py
+++ b/cinder/volume/drivers/prophetstor/dplcommon.py
@@@ -28,9 -28,10 +29,9 @@@ from oslo.utils import unit
  import six
  
  from cinder import exception
- from cinder.i18n import _, _LE, _LI
+ from cinder.i18n import _, _LI, _LW, _LE
  from cinder.openstack.common import log as logging
  from cinder.openstack.common import loopingcall
 -from cinder.openstack.common import units
  from cinder.volume import driver
  from cinder.volume.drivers.prophetstor import options
  from cinder.volume.drivers.san import san