From: Jenkins <jenkins@review.openstack.org>
Date: Mon, 22 Dec 2014 16:19:35 +0000 (+0000)
Subject: Merge "Rename oslo.concurrency to oslo_concurrency"
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=98706a9804d5896546cac0c565f74ec6cf0f24b9;p=openstack-build%2Fcinder-build.git

Merge "Rename oslo.concurrency to oslo_concurrency"
---

98706a9804d5896546cac0c565f74ec6cf0f24b9
diff --cc cinder/volume/drivers/ibm/gpfs.py
index 279b0ac5b,4fef4b1de..c5732eba4
--- a/cinder/volume/drivers/ibm/gpfs.py
+++ b/cinder/volume/drivers/ibm/gpfs.py
@@@ -21,12 -21,12 +21,12 @@@ import o
  import re
  import shutil
  
- from oslo.concurrency import processutils
  from oslo.config import cfg
  from oslo.utils import units
+ from oslo_concurrency import processutils
  
  from cinder import exception
 -from cinder.i18n import _, _LE
 +from cinder.i18n import _, _LE, _LI
  from cinder.image import image_utils
  from cinder.openstack.common import fileutils
  from cinder.openstack.common import log as logging