openstack/cinder
Code Issues Proposed changes

Merge "Fixes misspelled words in Cinder"

Browse Source
This commit is contained in:
Jenkins 2015-01-15 16:22:57 +00:00 committed by Gerrit Code Review
commit 309efa5db4
6 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cinder/volume/drivers/emc/emc_vmax_utils.py
View File

@ -1259,7 +1259,7 @@ class EMCVMAXUtils(object):
# Something else that we cannot recover from has happened
LOG.error(_LE("Exception: %s"), six.text_type(desc))
exceptionMessage = (_(
"Cannot verify the existance of object:"
"Cannot verify the existence of object:"
"%(instanceName)s.")
% {'instanceName': instanceName})
LOG.error(exceptionMessage)

4
cinder/volume/drivers/huawei/rest_common.py
View File

@ -687,8 +687,8 @@ class RestCommon():
except Exception:
with excutils.save_and_reraise_exception():
err_msg = (_LE(
'Error occured when adding hostgroup and lungroup to view.'
' Remove lun from lungroup now.'))
'Error occurred when adding hostgroup and lungroup to '
'view. Remove lun from lungroup now.'))
LOG.error(err_msg)
self._remove_lun_from_lungroup(lungroup_id, lun_id)

2
cinder/volume/drivers/remotefs.py
View File

@ -900,7 +900,7 @@ class RemoteFSSnapDriver(RemoteFSDriver):
'to be deleted.') % snapshot_path
LOG.warn(msg)
# Snapshot may be stale, so just delete it and update ther
# Snapshot may be stale, so just delete it and update the
# info file instead of blocking
return self._delete_stale_snapshot(snapshot)

2
cinder/volume/drivers/srb.py
View File

@ -246,7 +246,7 @@ def handle_process_execution_error(message, info_message, reraise=True):
the command string, exit code, standard output and error output of the
process will be logged at `logging.DEBUG` level.
The `reraise` argument specifies what should happend when a
The `reraise` argument specifies what should happen when a
`putils.ProcessExecutionError` is caught. If it's equal to `True`, the
exception will be re-raised. If it's some other non-`False` object, this
object will be raised instead (so you most likely want it to be some

4
cinder/volume/drivers/xio.py
View File

@ -119,7 +119,7 @@ class XIOISEDriver(object):
msg = _LE("Array query failed - No response (%d)!") % status
LOG.error(msg)
RaiseXIODriverException()
# succesfully fetched QUERY info. Parse out globalid along with
# Successfully fetched QUERY info. Parse out globalid along with
# ipaddress for Controller 1 and Controller 2. We assign primary
# ipaddress to use based on controller rank
xml_tree = etree.fromstring(resp['content'])
@ -830,7 +830,7 @@ class XIOISEDriver(object):
msg = _LE("POST for host create failed (%s)!") % status
LOG.error(msg)
RaiseXIODriverException()
# succesfully created host entry. Return host name.
# Successfully created host entry. Return host name.
return hostname
def _create_clone(self, volume, clone, clone_type):

2
cinder/volume/targets/iser.py
View File

@ -42,7 +42,7 @@ class ISERTgtAdm(TgtAdm):
self.volumes_dir = self.configuration.safe_get('volumes_dir')
self.protocol = 'iSER'
# backward compatability mess
# backwards compatibility mess
self.configuration.num_volume_device_scan_tries = \
self.configuration.num_iser_scan_tries
self.configuration.iscsi_num_targets = \