Merge "Rename oslo.concurrency to oslo_concurrency"

diff --cc cinder/tests/test_pure.py
Simple merge

diff --cc cinder/volume/drivers/ibm/gpfs.py
index 279b0ac5b283afebecc4a40b45423ed9f8a37e1b,4fef4b1de40c786e7e472a48650cf8b90930e5b4..c5732eba4834afce27e17f3396ec7151c389cf3a
--- 1/cinder/volume/drivers/ibm/gpfs.py
--- 2/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

diff --cc cinder/volume/drivers/lvm.py
Simple merge

diff --cc cinder/volume/drivers/pure.py
Simple merge