summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2019-01-08 04:44:41 +0000
committerGerrit Code Review <review@openstack.org>2019-01-08 04:44:41 +0000
commit1264ad108f3453b0f2af0f99d491492f718c7871 (patch)
tree4c1d3e40c88e27b27e510995614a009a906ca941
parent7c6b851d66d355a3e15847af3e63bb2433b9e968 (diff)
parentdaf393f8fe40b52edf17c73ec57c9a6c409ed1bc (diff)
Merge "Add missing ws seperator between words"
-rw-r--r--glance/common/wsgi.py2
-rw-r--r--glance/notifier.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/glance/common/wsgi.py b/glance/common/wsgi.py
index 7ccd76a..bda6f03 100644
--- a/glance/common/wsgi.py
+++ b/glance/common/wsgi.py
@@ -314,7 +314,7 @@ wsgi_opts = [
314store_opts = [ 314store_opts = [
315 cfg.DictOpt('enabled_backends', 315 cfg.DictOpt('enabled_backends',
316 help=_('Key:Value pair of store identifier and store type. ' 316 help=_('Key:Value pair of store identifier and store type. '
317 'In case of multiple backends should be separated' 317 'In case of multiple backends should be separated '
318 'using comma.')), 318 'using comma.')),
319] 319]
320 320
diff --git a/glance/notifier.py b/glance/notifier.py
index 8db5efc..1d16495 100644
--- a/glance/notifier.py
+++ b/glance/notifier.py
@@ -448,7 +448,7 @@ class ImageProxy(NotificationProxy, domain_proxy.Image):
448 raise webob.exc.HTTPBadRequest( 448 raise webob.exc.HTTPBadRequest(
449 explanation=encodeutils.exception_to_unicode(e)) 449 explanation=encodeutils.exception_to_unicode(e))
450 except exception.Duplicate as e: 450 except exception.Duplicate as e:
451 msg = (_("Unable to upload duplicate image data for image" 451 msg = (_("Unable to upload duplicate image data for image "
452 "%(image_id)s: %(error)s") % 452 "%(image_id)s: %(error)s") %
453 {'image_id': self.repo.image_id, 453 {'image_id': self.repo.image_id,
454 'error': encodeutils.exception_to_unicode(e)}) 454 'error': encodeutils.exception_to_unicode(e)})