Merge "Remove duplication of brick.iscsi in brick.iser"

diff --cc cinder/volume/driver.py
index c04c03207eb8a30c2b24fc045f30161f95d0bd2f,64b958e1f726f1f02eb1ebb2b6713d07e681ac39..226fbef20e67ccdf2a7393479b55e18ef200e484
--- 1/cinder/volume/driver.py
--- 2/cinder/volume/driver.py
+++ b/cinder/volume/driver.py
@@@ -25,8 -25,8 +25,7 @@@ import tim
  
  from oslo.config import cfg
  
 -from cinder.brick.initiator import connector as initiator
  from cinder.brick.iscsi import iscsi
- from cinder.brick.iser import iser
  from cinder import exception
  from cinder.image import image_utils
  from cinder.openstack.common import excutils

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