summaryrefslogtreecommitdiffstats
path: root/openstack
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2013-08-12 01:10:30 +0000
committerGerrit Code Review <review@openstack.org>2013-08-12 01:10:30 +0000
commitc2aabfa238960233e5d3cd5da62168813e80d7dd (patch)
treedbe0d1e7732f292e5209b2f1eaf7e5595bc67756 /openstack
parent2134a3f313446441e7fee9474b0b8b46500eac39 (diff)
parent35c317b6e00e969e20d8034f7bf350c6cc20bd96 (diff)
downloadoslo-c2aabfa238960233e5d3cd5da62168813e80d7dd.tar.gz
oslo-c2aabfa238960233e5d3cd5da62168813e80d7dd.tar.xz
oslo-c2aabfa238960233e5d3cd5da62168813e80d7dd.zip
Merge "Fix capitalization, it's OpenStack"
Diffstat (limited to 'openstack')
-rw-r--r--openstack/common/notifier/log_notifier.py2
-rw-r--r--openstack/common/notifier/rpc_notifier.py2
-rw-r--r--openstack/common/notifier/rpc_notifier2.py2
-rw-r--r--openstack/common/py3kcompat/urlutils.py2
4 files changed, 4 insertions, 4 deletions
diff --git a/openstack/common/notifier/log_notifier.py b/openstack/common/notifier/log_notifier.py
index d3ef0ae..96072ed 100644
--- a/openstack/common/notifier/log_notifier.py
+++ b/openstack/common/notifier/log_notifier.py
@@ -25,7 +25,7 @@ CONF = cfg.CONF
def notify(_context, message):
"""Notifies the recipient of the desired event given the model.
- Log notifications using openstack's default logging system.
+ Log notifications using OpenStack's default logging system.
"""
priority = message.get('priority',
diff --git a/openstack/common/notifier/rpc_notifier.py b/openstack/common/notifier/rpc_notifier.py
index 6bfc333..db47a8a 100644
--- a/openstack/common/notifier/rpc_notifier.py
+++ b/openstack/common/notifier/rpc_notifier.py
@@ -24,7 +24,7 @@ LOG = logging.getLogger(__name__)
notification_topic_opt = cfg.ListOpt(
'notification_topics', default=['notifications', ],
- help='AMQP topic used for openstack notifications')
+ help='AMQP topic used for OpenStack notifications')
CONF = cfg.CONF
CONF.register_opt(notification_topic_opt)
diff --git a/openstack/common/notifier/rpc_notifier2.py b/openstack/common/notifier/rpc_notifier2.py
index 55dd780..505a94e 100644
--- a/openstack/common/notifier/rpc_notifier2.py
+++ b/openstack/common/notifier/rpc_notifier2.py
@@ -26,7 +26,7 @@ LOG = logging.getLogger(__name__)
notification_topic_opt = cfg.ListOpt(
'topics', default=['notifications', ],
- help='AMQP topic(s) used for openstack notifications')
+ help='AMQP topic(s) used for OpenStack notifications')
opt_group = cfg.OptGroup(name='rpc_notifier2',
title='Options for rpc_notifier2')
diff --git a/openstack/common/py3kcompat/urlutils.py b/openstack/common/py3kcompat/urlutils.py
index 4471021..95ad274 100644
--- a/openstack/common/py3kcompat/urlutils.py
+++ b/openstack/common/py3kcompat/urlutils.py
@@ -17,7 +17,7 @@
#
"""
-Python2/Python3 compatibility layer for openstack
+Python2/Python3 compatibility layer for OpenStack
"""
import six