Merge "Improve grammar throughout nova."

Authors

@@ -155,6 +155,7 @@ Nikolay Sokolov <nsokolov@griddynamics.com>
 Nirmal Ranganathan <rnirmal@gmail.com>
 Ollie Leahy <oliver.leahy@hp.com>
 Pádraig Brady <pbrady@redhat.com>
+Paul McMillan <paul.mcmillan@nebula.com>
 Paul Voccio <paul@openstack.org>
 Peng Yong <ppyy@pubyun.com>
 Philip Knouff <philip.knouff@mailtrust.com>

nova/auth/ldapdriver.py

@@ -199,7 +199,7 @@ class LdapDriver(object):
         return False
 
     def __local_cache(key_fmt):  # pylint: disable=E0213
-        """Wrap function to cache it's result in self.__cache.
+        """Wrap function to cache its result in self.__cache.
         Works only with functions with one fixed argument.
         """
         def do_wrap(fn):

nova/tests/test_imagecache.py

@@ -133,7 +133,7 @@ class ImageCacheManagerTestCase(test.TestCase):
 
         image_cache_manager = imagecache.ImageCacheManager()
 
-        # The argument here should be a context, but its mocked out
+        # The argument here should be a context, but it's mocked out
         image_cache_manager._list_running_instances(None)
 
         self.assertEqual(len(image_cache_manager.used_images), 2)