x
/
distil
Code Issues Proposed changes

Merge "[Trivialfix]Fix typos in distil"

This commit is contained in:
Jenkins 2017-08-31 09:44:15 +00:00 committed by Gerrit Code Review
parent 99d1a16fb9 b862ce2b1d
commit 421f992f40
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
distil/collector/base.py
View File

@ -135,7 +135,7 @@ class BaseCollector(object):
root_vol = openstack.get_root_volume(entry['resource_id'])
except Exception as e:
LOG.warning(
'Error occured when getting root_volume for %s, reason: %s' %
'Error occurred when getting root_volume for %s, reason: %s' %
(entry['resource_id'], str(e))
)
@ -160,7 +160,7 @@ class BaseCollector(object):
)
except Exception as e:
LOG.warning(
'Error occured when getting image %s, reason: %s' %
'Error occurred when getting image %s, reason: %s' %
(image_id, str(e))
)

2
distil/erp/drivers/odoo.py
View File

@ -318,7 +318,7 @@ class OdooDriver(driver.BaseDriver):
result[v['date_invoice']].update({'details': details})
except Exception as e:
LOG.exception(
'Error occured when getting invoices from Odoo, '
'Error occurred when getting invoices from Odoo, '
'error: %s' % str(e)
)

2
distil/interface.py
View File

@ -111,7 +111,7 @@ def sort_entries(data):
class Tenant(object):
"""A wrapper object for the tenant recieved from keystone."""
"""A wrapper object for the tenant received from keystone."""
def __init__(self, tenant, conn):
self.tenant = tenant
self.conn = conn # the Interface object that produced us.