diff --git a/cinder/manager.py b/cinder/manager.py index 4d239d1b3fd..cc198b22701 100644 --- a/cinder/manager.py +++ b/cinder/manager.py @@ -119,7 +119,7 @@ class Manager(base.Base, PeriodicTasks): def is_working(self): """Method indicating if service is working correctly. - This method is supposed to be overriden by subclasses and return if + This method is supposed to be overridden by subclasses and return if manager is working correctly. """ return True diff --git a/cinder/tests/unit/api/test_common.py b/cinder/tests/unit/api/test_common.py index 066965a1b29..608833a4894 100644 --- a/cinder/tests/unit/api/test_common.py +++ b/cinder/tests/unit/api/test_common.py @@ -236,7 +236,7 @@ class SortParamUtilsTest(test.TestCase): self.assertEqual(['desc'], sort_dirs) def test_get_sort_params_override_defaults(self): - """Verifies that the defaults can be overriden.""" + """Verifies that the defaults can be overridden.""" sort_keys, sort_dirs = common.get_sort_params({}, default_key='key1', default_dir='dir1') self.assertEqual(['key1'], sort_keys) diff --git a/cinder/volume/drivers/emc/emc_vmax_utils.py b/cinder/volume/drivers/emc/emc_vmax_utils.py index c4fbfcfff26..cf228f419ed 100644 --- a/cinder/volume/drivers/emc/emc_vmax_utils.py +++ b/cinder/volume/drivers/emc/emc_vmax_utils.py @@ -2660,7 +2660,7 @@ class EMCVMAXUtils(object): def override_ratio(self, max_over_sub_ratio, max_sub_ratio_from_per): """Override ratio if necessary - The over subscription ratio will be overriden if the max subscription + The over subscription ratio will be overridden if the max subscription percent is less than the user supplied max oversubscription ratio. :param max_over_sub_ratio: user supplied over subscription ratio