summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-08-17 21:31:47 +0000
committerGerrit Code Review <review@openstack.org>2016-08-17 21:31:47 +0000
commit466abcc3c207c6604af9291216462d7b413a2b8b (patch)
tree115df6b50a356834bd024e4742f31e2c8ce3a5b2
parenta011cb24482eced995db2bb30e1df8bd3cea1de0 (diff)
parenta55c974a0359d0b567498489d15ca91abaf0c8fb (diff)
downloadoslo-messaging-466abcc3c207c6604af9291216462d7b413a2b8b.tar.gz
Merge "Clean outdated docstring and comment"5.8.0
-rw-r--r--oslo_messaging/_drivers/amqp.py7
-rw-r--r--oslo_messaging/tests/notify/test_logger.py2
2 files changed, 4 insertions, 5 deletions
diff --git a/oslo_messaging/_drivers/amqp.py b/oslo_messaging/_drivers/amqp.py
index d6ad58c..071a004 100644
--- a/oslo_messaging/_drivers/amqp.py
+++ b/oslo_messaging/_drivers/amqp.py
@@ -16,11 +16,10 @@
# under the License.
"""
-Shared code between AMQP based openstack.common.rpc implementations.
+Utilities for drivers based on the AMQPDriverBase.
-The code in this module is shared between the rpc implementations based on
-AMQP. Specifically, this includes impl_kombu. impl_carrot also
-uses AMQP, but is deprecated and predates this code.
+This module contains utility code used by drivers based on the AMQPDriverBase
+class. Specifically this includes the impl_rabbit driver.
"""
import collections
diff --git a/oslo_messaging/tests/notify/test_logger.py b/oslo_messaging/tests/notify/test_logger.py
index bf7e2d9..ede3fdc 100644
--- a/oslo_messaging/tests/notify/test_logger.py
+++ b/oslo_messaging/tests/notify/test_logger.py
@@ -29,7 +29,7 @@ from six.moves import mock
load_tests = testscenarios.load_tests_apply_scenarios
-# Stolen from openstack.common.logging
+# Stolen from oslo.log
logging.AUDIT = logging.INFO + 1
logging.addLevelName(logging.AUDIT, 'AUDIT')