Merge "Fix grammatical mistake in defining articles."

cinder/api/v2/views/volumes.py

@@ -43,7 +43,7 @@ class ViewBuilder(common.ViewBuilder):
                                self._collection_name + '/detail')
 
     def summary(self, request, volume):
-        """Generic, non-detailed view of an volume."""
+        """Generic, non-detailed view of a volume."""
         return {
             'volume': {
                 'id': volume['id'],

cinder/db/api.py

@@ -241,7 +241,7 @@ def volume_get_iscsi_target_num(context, volume_id):
 
 
 def volume_update(context, volume_id, values):
-    """Set the given properties on an volume and update it.
+    """Set the given properties on a volume and update it.
 
     Raises NotFound if volume does not exist.
 

cinder/scheduler/driver.py

@@ -34,7 +34,7 @@ scheduler_driver_opts = [
                help='The scheduler host manager class to use'),
     cfg.IntOpt('scheduler_max_attempts',
                default=3,
-               help='Maximum number of attempts to schedule an volume'),
+               help='Maximum number of attempts to schedule a volume'),
 ]
 
 CONF = cfg.CONF

cinder/scheduler/host_manager.py

@@ -265,7 +265,7 @@ class HostState(object):
         self.updated = capability['timestamp']
 
     def consume_from_volume(self, volume):
-        """Incrementally update host state from an volume."""
+        """Incrementally update host state from a volume."""
         volume_gb = volume['size']
         self.allocated_capacity_gb += volume_gb
         self.provisioned_capacity_gb += volume_gb

cinder/tests/unit/api/contrib/test_volume_type_encryption.py

@@ -481,7 +481,7 @@ class VolumeTypeEncryptionTest(test.TestCase):
 
     def test_delete_with_no_encryption(self):
         volume_type = self._default_volume_type
-        # create an volume type
+        # create a volume type
         db.volume_type_create(context.get_admin_context(), volume_type)
 
         # without creating encryption type, try to delete

cinder/volume/drivers/rbd.py

@@ -612,7 +612,7 @@ class RBDDriver(driver.TransferVD, driver.ExtendVD,
         return (None, None, None)
 
     def _get_children_info(self, volume, snap):
-        """List children for the given snapshot of an volume(image).
+        """List children for the given snapshot of a volume(image).
 
         Returns a list of (pool, image).
         """