From 146a80fbaee58d0870fa08949d0160eb0707da30 Mon Sep 17 00:00:00 2001
From: Kun Huang <academicgareth@gmail.com>
Date: Tue, 10 Sep 2013 23:34:26 +0800
Subject: [PATCH] fix missing unit in log message

Bad log message:
    "extend volume 1 to 2"
Correct one:
    "extend volume 1 GB to 2 GB"

(also update my profile in .mailmap)

Change-Id: I6d229c4440f2f5443b45a10f3912c20e21c63f32
---
 .mailmap                                 | 1 +
 cinder/volume/drivers/coraid.py          | 4 ++--
 cinder/volume/drivers/rbd.py             | 2 +-
 cinder/volume/drivers/sheepdog.py        | 2 +-
 cinder/volume/drivers/windows/windows.py | 2 +-
 5 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/.mailmap b/.mailmap
index d447c4ca422..4302849432d 100644
--- a/.mailmap
+++ b/.mailmap
@@ -26,6 +26,7 @@
 <dprince@redhat.com> <dan.prince@rackspace.com>
 <edouard1.thuleau@orange.com> <thuleau@gmail.com>
 <ewan.mellor@citrix.com> <emellor@silver>
+<gareth@unitedstack.com> <academicgareth@gmail.com>
 <ghe@debian.org> <ghe.rivero@gmail.com>
 <itoumsn@nttdata.co.jp> <itoumsn@shayol>
 <jake@ansolabs.com> <jake@markupisart.com>
diff --git a/cinder/volume/drivers/coraid.py b/cinder/volume/drivers/coraid.py
index c42f6ba331c..b05dd8187a2 100644
--- a/cinder/volume/drivers/coraid.py
+++ b/cinder/volume/drivers/coraid.py
@@ -314,7 +314,7 @@ class CoraidAppliance(object):
         return esm_result
 
     def resize_volume(self, volume_name, new_volume_size_in_gb):
-        LOG.debug(_('Resize volume "%(name)s" to %(size)s') %
+        LOG.debug(_('Resize volume "%(name)s" to %(size)s GB.') %
                   {'name': volume_name,
                    'size': new_volume_size_in_gb})
         repository = self.get_volume_repository(volume_name)
@@ -332,7 +332,7 @@ class CoraidAppliance(object):
                    'args': 'resize'}
         esm_result = self.esm_command(request)
 
-        LOG.debug(_('Volume "%(name)s" resized. New size is %(size)s') %
+        LOG.debug(_('Volume "%(name)s" resized. New size is %(size)s GB.') %
                   {'name': volume_name,
                    'size': new_volume_size_in_gb})
         return esm_result
diff --git a/cinder/volume/drivers/rbd.py b/cinder/volume/drivers/rbd.py
index 6749af18aee..da8b1104033 100644
--- a/cinder/volume/drivers/rbd.py
+++ b/cinder/volume/drivers/rbd.py
@@ -810,5 +810,5 @@ class RBDDriver(driver.VolumeDriver):
             LOG.error(msg)
             raise exception.VolumeBackendAPIException(data=msg)
 
-        LOG.debug(_("Extend volume from %(old_size)s to %(new_size)s"),
+        LOG.debug(_("Extend volume from %(old_size)s GB to %(new_size)s GB."),
                   {'old_size': old_size, 'new_size': new_size})
diff --git a/cinder/volume/drivers/sheepdog.py b/cinder/volume/drivers/sheepdog.py
index c68f85a6bbf..54e85a594be 100644
--- a/cinder/volume/drivers/sheepdog.py
+++ b/cinder/volume/drivers/sheepdog.py
@@ -197,7 +197,7 @@ class SheepdogDriver(driver.VolumeDriver):
             LOG.error(msg)
             raise exception.VolumeBackendAPIException(data=msg)
 
-        LOG.debug(_("Extend volume from %(old_size)s to %(new_size)s"),
+        LOG.debug(_("Extend volume from %(old_size)s GB to %(new_size)s GB."),
                   {'old_size': old_size, 'new_size': new_size})
 
     def backup_volume(self, context, backup, backup_service):
diff --git a/cinder/volume/drivers/windows/windows.py b/cinder/volume/drivers/windows/windows.py
index 9c2738e8234..0e62b736aad 100644
--- a/cinder/volume/drivers/windows/windows.py
+++ b/cinder/volume/drivers/windows/windows.py
@@ -221,7 +221,7 @@ class WindowsDriver(driver.ISCSIDriver):
     def extend_volume(self, volume, new_size):
         """Extend an Existing Volume."""
         old_size = volume['size']
-        LOG.debug(_("Extended volume from %(old_size)s to %(new_size)s"),
+        LOG.debug(_("Extend volume from %(old_size)s GB to %(new_size)s GB."),
                   {'old_size': old_size, 'new_size': new_size})
         additional_size = (new_size - old_size) * 1024
         self.utils.extend(volume['name'], additional_size)