diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index 0d6d91139f..d8b829eeb5 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -223,7 +223,7 @@ pylint will encouter in the gate. Pre-commit checklist ==================== -Before commiting code to Gerrit for review, please at least do the +Before committing code to Gerrit for review, please at least do the following on your development system and ensure that they pass. .. code-block:: bash diff --git a/trove/guestagent/datastore/manager.py b/trove/guestagent/datastore/manager.py index 5d3e94dd99..be3778e760 100644 --- a/trove/guestagent/datastore/manager.py +++ b/trove/guestagent/datastore/manager.py @@ -400,7 +400,7 @@ class Manager(periodic_task.PeriodicTasks): return {} def post_upgrade(self, context, upgrade_info): - """Recovers the guest after the image is upgraded using infomation + """Recovers the guest after the image is upgraded using information from the pre_upgrade step """ pass diff --git a/trove/guestagent/strategies/backup/experimental/db2_impl.py b/trove/guestagent/strategies/backup/experimental/db2_impl.py index 57d0ecb40b..14790459cf 100644 --- a/trove/guestagent/strategies/backup/experimental/db2_impl.py +++ b/trove/guestagent/strategies/backup/experimental/db2_impl.py @@ -57,7 +57,7 @@ class DB2Backup(base.BackupRunner): dbname}) size = size + int(out[0]) except exception.ProcessExecutionError: - LOG.exception(_("An error occured while trying to " + LOG.exception(_("An error occurred while trying to " "estimate backup size")) LOG.debug("Estimated size for databases: " + str(size)) return size