openstack/nova
Code Issues Proposed changes

Merge "correcting for proper use of the word 'an'."

Browse Source
This commit is contained in:
Jenkins 2013-01-21 22:58:28 +00:00 committed by Gerrit Code Review
commit 9ebcd1d91c
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/source/devref/aggregates.rst
View File

@ -23,7 +23,7 @@ Host aggregates can be regarded as a mechanism to further partition an availabil
Xen Pool Host Aggregates
===============
Originally all aggregates were Xen resource pools, now a aggregate can be set up as a resource pool by giving the aggregate the correct key-value pair.
Originally all aggregates were Xen resource pools, now an aggregate can be set up as a resource pool by giving the aggregate the correct key-value pair.
You can use aggregates for XenServer resource pools when you have multiple compute nodes installed (only XenServer/XCP via xenapi driver is currently supported), and you want to leverage the capabilities of the underlying hypervisor resource pools. For example, you want to enable VM live migration (i.e. VM migration within the pool) or enable host maintenance with zero-downtime for guest instances. Please, note that VM migration across pools (i.e. storage migration) is not yet supported in XenServer/XCP, but will be added when available. Bear in mind that the two migration techniques are not mutually exclusive and can be used in combination for a higher level of flexibility in your cloud management.

2
nova/api/ec2/ec2utils.py
View File

@ -178,7 +178,7 @@ def ec2_vol_id_to_uuid(ec2_id):
def is_ec2_timestamp_expired(request, expires=None):
"""Checks the timestamp or expiry time included in a EC2 request
"""Checks the timestamp or expiry time included in an EC2 request
and returns true if the request is expired
"""
query_time = None

2
nova/openstack/common/rpc/impl_kombu.py
View File

@ -175,7 +175,7 @@ class ConsumerBase(object):
try:
self.queue.cancel(self.tag)
except KeyError, e:
# NOTE(comstud): Kludge to get around a amqplib bug
# NOTE(comstud): Kludge to get around an amqplib bug
if str(e) != "u'%s'" % self.tag:
raise
self.queue = None

4
nova/tests/integrated/test_api_samples.py
View File

@ -672,7 +672,7 @@ class ImagesSampleJsonTest(ApiSampleTestBase):
return self._verify_response('images-details-get-resp', subs, response)
def test_image_metadata_get(self):
# Get api sample of a image metadata request.
# Get api sample of an image metadata request.
image_id = fake.get_valid_image_id()
response = self._do_get('images/%s/metadata' % image_id)
subs = self._get_regexes()
@ -701,7 +701,7 @@ class ImagesSampleJsonTest(ApiSampleTestBase):
subs, response)
def test_image_meta_key_get(self):
# Get api sample of a image metadata key request.
# Get api sample of an image metadata key request.
image_id = fake.get_valid_image_id()
key = "kernel_id"
response = self._do_get('images/%s/metadata/%s' % (image_id, key))

2
nova/virt/images.py
View File

@ -175,7 +175,7 @@ class QemuImgInfo(object):
def qemu_img_info(path):
"""Return a object containing the parsed output from qemu-img info."""
"""Return an object containing the parsed output from qemu-img info."""
if not os.path.exists(path):
return QemuImgInfo()