Merge "Fix typos in code comments & docstrings"

7 files changed, 9 insertions, 9 deletions

diff --git a/ceilometer/api/app.py b/ceilometer/api/app.py
index b578b98f..b52586f7 100644
--- a/ceilometer/api/app.py
+++ b/ceilometer/api/app.py
@@ -120,7 +120,7 @@ def get_handler_cls():
             if cfg.CONF.api.enable_reverse_dns_lookup:
                 return super(CeilometerHandler, self).address_string()
             else:
-                # disable reverse dns lookup, directly return ip adress
+                # disable reverse dns lookup, directly return ip address
                 return self.client_address[0]
 
     return CeilometerHandler
diff --git a/ceilometer/event/converter.py b/ceilometer/event/converter.py
index 3e00f730..d6c9466c 100644
--- a/ceilometer/event/converter.py
+++ b/ceilometer/event/converter.py
@@ -291,7 +291,7 @@ class NotificationEventsConverter(object):
         (e.g. 'payload.host') or dictionary syntax (e.g. 'payload[host]') is
         also supported.
         In either case, if the key for the field you are looking for contains
-        special charecters, like '.', it will need to be quoted (with double
+        special characters, like '.', it will need to be quoted (with double
         or single quotes) like so::
 
          "payload.image_meta.'org.openstack__1__architecture'"
diff --git a/ceilometer/image/glance.py b/ceilometer/image/glance.py
index da894afd..e102f65c 100644
--- a/ceilometer/image/glance.py
+++ b/ceilometer/image/glance.py
@@ -62,7 +62,7 @@ class _Base(plugin.CentralPollster):
         # all the public images together with private images.
         # As a result, if the user/tenant has an admin role
         # for ceilometer to collect image list,
-        # the _Base.iter_images method will return a image list
+        # the _Base.iter_images method will return an image list
         # which contains duplicate images. Add the following
         # code to avoid recording down duplicate image events.
         imageIdSet = set(image.id for image in rawImageList)
diff --git a/ceilometer/publisher/rpc.py b/ceilometer/publisher/rpc.py
index 47a2dab4..bf3c5a5b 100644
--- a/ceilometer/publisher/rpc.py
+++ b/ceilometer/publisher/rpc.py
@@ -166,7 +166,7 @@ class RPCPublisher(publisher.PublisherBase):
         # if rabbit_max_retries <= 0:
         #   it returns only if the msg has been sent on the amqp queue
         # if rabbit_max_retries > 0:
-        #   it raises a exception if rabbitmq is unreachable
+        #   it raises an exception if rabbitmq is unreachable
         #
         # the default policy just respect the rabbitmq configuration
         # nothing special is done if rabbit_max_retries <= 0
diff --git a/ceilometer/storage/hbase/utils.py b/ceilometer/storage/hbase/utils.py
index ac927ec2..98209160 100644
--- a/ceilometer/storage/hbase/utils.py
+++ b/ceilometer/storage/hbase/utils.py
@@ -102,7 +102,7 @@ def make_timestamp_query(func, start=None, start_op=None, end=None,
         return start_row, end_row
 
     q = []
-    # We dont need to dump here because get_start_end_rts returns strings
+    # We don't need to dump here because get_start_end_rts returns strings
     if rts_start:
         q.append("SingleColumnValueFilter ('f', 'rts', <=, 'binary:%s')" %
                  rts_start)
@@ -143,7 +143,7 @@ def make_query(metaquery=None, trait_query=None, **kwargs):
     res_q = None
 
     # Query for traits differs from others. It is constructed with
-    # SingleColumnValueFilter with the possibility to choose comparision
+    # SingleColumnValueFilter with the possibility to choose comparison
     # operator
     if trait_query:
         trait_name = kwargs.pop('key')
diff --git a/ceilometer/storage/mongo/utils.py b/ceilometer/storage/mongo/utils.py
index d2f53fc8..8c52a0bc 100644
--- a/ceilometer/storage/mongo/utils.py
+++ b/ceilometer/storage/mongo/utils.py
@@ -232,7 +232,7 @@ class QueryTransformer(object):
     def _move_negation_to_leaf(condition):
         """Moves every not operator to the leafs.
 
-        Moving is going by applying the De Morgan rules and anihilating
+        Moving is going by applying the De Morgan rules and annihilating
         double negations.
         """
         def _apply_de_morgan(tree, negated_subtree, negated_op):
@@ -259,7 +259,7 @@ class QueryTransformer(object):
                     _apply_de_morgan(subtree, negated_tree, negated_op)
                     transform(subtree)
                 elif negated_op == "not":
-                    # two consecutive not annihilates theirselves
+                    # two consecutive not annihilates themselves
                     new_op = negated_tree.values()[0].keys()[0]
                     subtree[new_op] = negated_tree[negated_op][new_op]
                     del subtree["not"]
diff --git a/ceilometer/tests/image/test_glance.py b/ceilometer/tests/image/test_glance.py
index 07d3bae1..65a61709 100644
--- a/ceilometer/tests/image/test_glance.py
+++ b/ceilometer/tests/image/test_glance.py
@@ -134,7 +134,7 @@ class TestImagePollster(test.BaseTestCase):
             side_effect=self.fake_get_glance_client))
 
     def test_iter_images(self):
-        # Tests whether the iter_images method returns an unique image
+        # Tests whether the iter_images method returns a unique image
         # list when there is nothing in the cache
         images = list(glance.ImagePollster().
                       _iter_images(self.manager.keystone, {}))