openstack/nova
Code Issues Proposed changes

Merge "[TrivialFix] Fix comment typo error"

Browse Source
This commit is contained in:
Jenkins
2017-01-04 04:16:06 +00:00
committed by Gerrit Code Review
parent 34f4b1bd68 10fdc075fd
commit f8cca1b083
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
nova/cells/utils.py
View File

@@ -123,7 +123,7 @@ class ServiceProxy(_CellProxy):
# ComputeNode object that consumers of this Proxy don't use, we can # ComputeNode object that consumers of this Proxy don't use, we can
# safely remove it from what's returned # safely remove it from what's returned
raise AttributeError raise AttributeError
# NOTE(claudiub): needed for py34 compatiblity. # NOTE(claudiub): needed for py34 compatibility.
# get self._obj first, without ending into an infinite recursion. # get self._obj first, without ending into an infinite recursion.
return getattr(self.__getattribute__("_obj"), key) return getattr(self.__getattribute__("_obj"), key)

2
nova/conf/compute.py
View File

@@ -289,7 +289,7 @@ notifications are consumed by OpenStack Telemetry service.
min=0, min=0,
help=""" help="""
Maximum number of 1 second retries in live_migration. It specifies number Maximum number of 1 second retries in live_migration. It specifies number
of retries to iptables when it complains. It happens when an user continously of retries to iptables when it complains. It happens when an user continuously
sends live-migration request to same host leading to concurrent request sends live-migration request to same host leading to concurrent request
to iptables. to iptables.

4
nova/conf/xenserver.py
View File

@@ -257,7 +257,7 @@ xenapi_vm_utils_opts = [
help=""" help="""
Cache glance images locally. Cache glance images locally.
The value for this option must be choosen from the choices listed The value for this option must be chosen from the choices listed
here. Configuring a value other than these will default to 'all'. here. Configuring a value other than these will default to 'all'.
Note: There is nothing that deletes these images. Note: There is nothing that deletes these images.
@@ -336,7 +336,7 @@ If set to 0, should try once, no retries.
help=""" help="""
Whether or not to download images via Bit Torrent. Whether or not to download images via Bit Torrent.
The value for this option must be choosen from the choices listed The value for this option must be chosen from the choices listed
here. Configuring a value other than these will default to 'none'. here. Configuring a value other than these will default to 'none'.
Possible values: Possible values: