summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2014-09-19 06:19:01 +0000
committerGerrit Code Review <review@openstack.org>2014-09-19 06:19:01 +0000
commit87a1ebcd1419733d0fd2d3cd9e76e373a7eb0be7 (patch)
tree8fd636b7be254677799d7d1218737a9515d0b972
parent3877f871a5ca0b5d7ef31ef1cdb96621a9b22e29 (diff)
parent98acb7fb7d9f6179c0cddc59ecf050831a6a6464 (diff)
downloadpython-novaclient-87a1ebcd1419733d0fd2d3cd9e76e373a7eb0be7.tar.gz
Merge "Corrects typos "coearse," "proejct," and "unecrypts""
-rw-r--r--novaclient/crypto.py2
-rw-r--r--novaclient/v1_1/cloudpipe.py2
-rw-r--r--novaclient/v1_1/servers.py2
3 files changed, 3 insertions, 3 deletions
diff --git a/novaclient/crypto.py b/novaclient/crypto.py
index d817be5b..21af60cd 100644
--- a/novaclient/crypto.py
+++ b/novaclient/crypto.py
@@ -22,7 +22,7 @@ class DecryptionFailure(Exception):
def decrypt_password(private_key, password):
- """Base64 decodes password and unecrypts it with private key.
+ """Base64 decodes password and unencrypts it with private key.
Requires openssl binary available in the path.
"""
diff --git a/novaclient/v1_1/cloudpipe.py b/novaclient/v1_1/cloudpipe.py
index 74fed75c..6e05f4a2 100644
--- a/novaclient/v1_1/cloudpipe.py
+++ b/novaclient/v1_1/cloudpipe.py
@@ -19,7 +19,7 @@ from novaclient import base
class Cloudpipe(base.Resource):
- """A cloudpipe instance is a VPN attached to a proejct's VLAN."""
+ """A cloudpipe instance is a VPN attached to a project's VLAN."""
def __repr__(self):
return "<Cloudpipe: %s>" % self.project_id
diff --git a/novaclient/v1_1/servers.py b/novaclient/v1_1/servers.py
index 43b45ebb..38bde8c6 100644
--- a/novaclient/v1_1/servers.py
+++ b/novaclient/v1_1/servers.py
@@ -428,7 +428,7 @@ class ServerManager(base.BootingManagerWithFind):
file-like object). A maximum of five entries is allowed,
and each file must be 10k or less.
:param reservation_id: a UUID for the set of servers being requested.
- :param return_raw: If True, don't try to coearse the result into
+ :param return_raw: If True, don't try to coerce the result into
a Resource object.
:param security_groups: list of security group names
:param key_name: (optional extension) name of keypair to inject into