Merge "Use six.text_type instead of unicode"

diff --cc cinder/backup/chunkeddriver.py
Simple merge

diff --cc cinder/backup/manager.py
index 0f8eaa5e1f02992617921823c3210b8726561c1d,8bdde385222dd33ce4077dedbdca9d097b74dc0e..73756fb901ddc68d9aebb4d24558fffb7e5af1c8
--- 1/cinder/backup/manager.py
--- 2/cinder/backup/manager.py
+++ b/cinder/backup/manager.py
@@@ -626,10 -628,10 +627,10 @@@ class BackupManager(manager.SchedulerDe
                      self.db.backup_update(context, backup_id,
                                            {'status': 'error',
                                             'fail_reason':
-                                            unicode(err)})
+                                            six.text_type(err)})
  
              LOG.info(_LI('Import record id %s metadata from driver '
 -                         'finished.') % backup_id)
 +                         'finished.'), backup_id)
  
      def reset_status(self, context, backup_id, status):
          """Reset volume backup status.

diff --cc cinder/hacking/checks.py
Simple merge

diff --cc cinder/tests/brick/test_brick_connector.py
Simple merge

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

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

diff --cc cinder/volume/manager.py
Simple merge