Merge "correcting for proper use of the word 'an'."

4 files changed, 5 insertions, 5 deletions

diff --git a/nova/api/ec2/ec2utils.py b/nova/api/ec2/ec2utils.py
index cfe0d7879..1ce880de4 100644
--- a/nova/api/ec2/ec2utils.py
+++ b/nova/api/ec2/ec2utils.py
@@ -178,7 +178,7 @@ def ec2_vol_id_to_uuid(ec2_id):
 
 
 def is_ec2_timestamp_expired(request, expires=None):
-    """Checks the timestamp or expiry time included in a EC2 request
+    """Checks the timestamp or expiry time included in an EC2 request
     and returns true if the request is expired
     """
     query_time = None
diff --git a/nova/openstack/common/rpc/impl_kombu.py b/nova/openstack/common/rpc/impl_kombu.py
index bf38201f5..305dc7877 100644
--- a/nova/openstack/common/rpc/impl_kombu.py
+++ b/nova/openstack/common/rpc/impl_kombu.py
@@ -175,7 +175,7 @@ class ConsumerBase(object):
         try:
             self.queue.cancel(self.tag)
         except KeyError, e:
-            # NOTE(comstud): Kludge to get around a amqplib bug
+            # NOTE(comstud): Kludge to get around an amqplib bug
             if str(e) != "u'%s'" % self.tag:
                 raise
         self.queue = None
diff --git a/nova/tests/integrated/test_api_samples.py b/nova/tests/integrated/test_api_samples.py
index aa41a8259..949f14177 100644
--- a/nova/tests/integrated/test_api_samples.py
+++ b/nova/tests/integrated/test_api_samples.py
@@ -672,7 +672,7 @@ class ImagesSampleJsonTest(ApiSampleTestBase):
         return self._verify_response('images-details-get-resp', subs, response)
 
     def test_image_metadata_get(self):
-        # Get api sample of a image metadata request.
+        # Get api sample of an image metadata request.
         image_id = fake.get_valid_image_id()
         response = self._do_get('images/%s/metadata' % image_id)
         subs = self._get_regexes()
@@ -701,7 +701,7 @@ class ImagesSampleJsonTest(ApiSampleTestBase):
                                      subs, response)
 
     def test_image_meta_key_get(self):
-        # Get api sample of a image metadata key request.
+        # Get api sample of an image metadata key request.
         image_id = fake.get_valid_image_id()
         key = "kernel_id"
         response = self._do_get('images/%s/metadata/%s' % (image_id, key))
diff --git a/nova/virt/images.py b/nova/virt/images.py
index f80c19999..9788a2b42 100644
--- a/nova/virt/images.py
+++ b/nova/virt/images.py
@@ -175,7 +175,7 @@ class QemuImgInfo(object):
 
 
 def qemu_img_info(path):
-    """Return a object containing the parsed output from qemu-img info."""
+    """Return an object containing the parsed output from qemu-img info."""
     if not os.path.exists(path):
         return QemuImgInfo()