Merge "Removed confusing typos in utils/openstack/base.py file"

This commit is contained in:
Jenkins 2015-08-24 19:07:51 +00:00 committed by Gerrit Code Review
commit bb5417b49d

View File

@ -84,7 +84,7 @@ def execute_with_retries(method, *args, **kwargs):
error_code = getattr(e, 'http_status', None) or getattr(
e, 'status_code', None) or getattr(e, 'code', None)
if error_code in ERRORS_TO_RETRY:
LOG.warning(_LW('Occasional error occured during "{method}" '
LOG.warning(_LW('Occasional error occurred during "{method}" '
'execution: {error_msg} ({error_code}). '
'Operation will be retried.').format(
method=method.__name__,
@ -94,7 +94,7 @@ def execute_with_retries(method, *args, **kwargs):
retry_after = getattr(e, 'retry_after', 0)
context.sleep(max(retry_after, CONF.retries.retry_after))
else:
LOG.debug('Permanent error occured during "{method}" '
LOG.debug('Permanent error occurred during "{method}" '
'execution: {error_msg}.'.format(
method=method.__name__, error_msg=e))
raise e