diff options
author | Soren Hansen <soren.hansen@rackspace.com> | 2010-09-22 13:26:36 +0200 |
---|---|---|
committer | Soren Hansen <soren.hansen@rackspace.com> | 2010-09-22 13:26:36 +0200 |
commit | d42e168763d232476407a07b79056fb745c6075e (patch) | |
tree | 25e98655b2fcf9a05ecc832ee17e0c1d9e7f2221 /nova/crypto.py | |
parent | 28336ed41e0d44d7600588a6014f6253e4b87a42 (diff) | |
parent | 4e727faf450154d89687b1a33dae2159d5b691a0 (diff) | |
download | nova-d42e168763d232476407a07b79056fb745c6075e.tar.gz nova-d42e168763d232476407a07b79056fb745c6075e.tar.xz nova-d42e168763d232476407a07b79056fb745c6075e.zip |
Merge trunk
Diffstat (limited to 'nova/crypto.py')
-rw-r--r-- | nova/crypto.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/crypto.py b/nova/crypto.py index b05548ea1..1c6fe57ad 100644 --- a/nova/crypto.py +++ b/nova/crypto.py @@ -18,7 +18,7 @@ """ Wrappers around standard crypto, including root and intermediate CAs, -SSH keypairs and x509 certificates. +SSH key_pairs and x509 certificates. """ import base64 |