openstack/trove
Code Issues Proposed changes

Merge "Fixed misspellings of common words"

Browse Source
This commit is contained in:
Jenkins 2013-12-12 18:29:47 +00:00 committed by Gerrit Code Review
commit 453c58a800
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/source/dev/design.rst
View File

@ -94,7 +94,7 @@ bus and performs the requested operation.
Trove-conductor Trove-conductor
=============== ===============
Conductor is a service that runs on the host, responsible for recieving Conductor is a service that runs on the host, responsible for receiving
messages from guest instances to update information on the host. messages from guest instances to update information on the host.
For example, instance statuses and the current status of a backup. For example, instance statuses and the current status of a backup.
With conductor, guest instances do not need a direct connection to the With conductor, guest instances do not need a direct connection to the

2
etc/trove/trove.conf.sample
View File

@ -125,7 +125,7 @@ control_exchange = trove
# ============ SSL configuration (and enablement) ============================= # ============ SSL configuration (and enablement) =============================
# In order to enable SSL for the trove api server, uncomment # In order to enable SSL for the trove api server, uncomment
# the cert_file and key_file - and of course have those files # the cert_file and key_file - and of course have those files
# accessible. The existance of those setting and files will # accessible. The existence of those setting and files will
# enable SSL. # enable SSL.
[ssl] [ssl]

2
trove/common/wsgi.py
View File

@ -273,7 +273,7 @@ class Request(openstack_wsgi.Request):
class Result(object): class Result(object):
"""A result whose serialization is compatable with JSON and XML. """A result whose serialization is compatible with JSON and XML.
This class is used by TroveResponseSerializer, which calls the This class is used by TroveResponseSerializer, which calls the
data method to grab a JSON or XML specific dictionary which it then data method to grab a JSON or XML specific dictionary which it then

2
trove/tests/api/instances.py
View File

@ -1038,7 +1038,7 @@ class DeleteInstance(object):
except exceptions.NotFound: except exceptions.NotFound:
pass pass
except Exception as ex: except Exception as ex:
fail("A failure occured when trying to GET instance %s for the %d" fail("A failure occurred when trying to GET instance %s for the %d"
" time: %s" % (str(instance_info.id), attempts, str(ex))) " time: %s" % (str(instance_info.id), attempts, str(ex)))
@time_out(30) @time_out(30)

2
trove/tests/fakes/nova.py
View File

@ -289,7 +289,7 @@ class FakeServers(object):
if block_device_mapping is not None: if block_device_mapping is not None:
# block_device_mapping is a dictionary, where the key is the # block_device_mapping is a dictionary, where the key is the
# device name on the compute instance and the mapping info is a # device name on the compute instance and the mapping info is a
# set of fields in a string, seperated by colons. # set of fields in a string, separated by colons.
# For each device, find the volume, and record the mapping info # For each device, find the volume, and record the mapping info
# to another fake object and attach it to the volume # to another fake object and attach it to the volume
# so that the fake API can later retrieve this. # so that the fake API can later retrieve this.