From: Jenkins <jenkins@review.openstack.org>
Date: Sat, 7 Sep 2013 06:37:26 +0000 (+0000)
Subject: Merge "fix inconsistent i18n log message"
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=35d17b564eedaae3e55bdb5a9f4efbff99bacd38;p=openstack-build%2Fcinder-build.git

Merge "fix inconsistent i18n log message"
---

35d17b564eedaae3e55bdb5a9f4efbff99bacd38
diff --cc cinder/exception.py
index e28a104f8,603889b30..7ff17f785
--- a/cinder/exception.py
+++ b/cinder/exception.py
@@@ -606,11 -606,15 +606,11 @@@ class TransferNotFound(NotFound)
  
  
  class VolumeMigrationFailed(CinderException):
-     message = _("Volume migration failed") + ": %(reason)s"
+     message = _("Volume migration failed: %(reason)s")
  
  
 -class ProtocolNotSupported(CinderException):
 -    message = _("Connect to volume via protocol %(protocol)s not supported.")
 -
 -
  class SSHInjectionThreat(CinderException):
-     message = _("SSH command injection detected") + ": %(command)s"
+     message = _("SSH command injection detected: %(command)s")
  
  
  class CoraidException(CinderException):