diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-05-16 15:41:30 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-05-16 15:41:30 +0000 |
| commit | 09eb1843f14dc438c61562e7f5204b0df68335d7 (patch) | |
| tree | 16adc985f5d9a2e08bdd7b273c8ba96f06748f0f | |
| parent | 1270cb220879218e998714e2d7d6848b5ebd3b65 (diff) | |
| parent | 2d30656f41b26bc01c8983f294bda1e5dec2e576 (diff) | |
| download | python-swiftclient-09eb1843f14dc438c61562e7f5204b0df68335d7.tar.gz | |
Merge "fixed typos found by RETF rules"
| -rw-r--r-- | swiftclient/client.py | 6 | ||||
| -rwxr-xr-x | swiftclient/shell.py | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/swiftclient/client.py b/swiftclient/client.py index 3fb615a..5494f34 100644 --- a/swiftclient/client.py +++ b/swiftclient/client.py @@ -274,7 +274,7 @@ def get_auth_1_0(url, user, key, snet, **kwargs): def get_keystoneclient_2_0(auth_url, user, key, os_options, **kwargs): """ - Authenticate against a auth 2.0 server. + Authenticate against an auth 2.0 server. We are using the keystoneclient library for our 2.0 authentication. """ @@ -898,7 +898,7 @@ def put_object(url, token=None, container=None, name=None, contents=None, :param etag: etag of contents; if None, no etag will be sent :param chunk_size: chunk size of data to write; it defaults to 65536; used only if the contents object has a 'read' - method, eg. file-like objects, ignored otherwise + method, e.g. file-like objects, ignored otherwise :param content_type: value to send as content-type header; if None, no content-type will be set (remote end will likely try to auto-detect it) @@ -1117,7 +1117,7 @@ class Connection(object): :param max_backoff: maximum delay between retries (seconds) :param auth_version: OpenStack auth version, default is 1.0 :param tenant_name: The tenant/account name, required when connecting - to a auth 2.0 system. + to an auth 2.0 system. :param os_options: The OpenStack options which can have tenant_id, auth_token, service_type, endpoint_type, tenant_name, object_storage_url, region_name diff --git a/swiftclient/shell.py b/swiftclient/shell.py index 9e12b2a..d035388 100755 --- a/swiftclient/shell.py +++ b/swiftclient/shell.py @@ -831,7 +831,7 @@ Optional arguments: --segment-container <container> Upload the segments into the specified container. If not specified, the segments will be uploaded to a - <container>_segments container so as to not pollute the + <container>_segments container to not pollute the main <container> listings. --leave-segments Indicates that you want the older segments of manifest objects left alone (in the case of overwrites). @@ -872,7 +872,7 @@ def st_upload(parser, args, thread_manager): '-C', '--segment-container', dest='segment_container', help='Upload the segments into the specified container. ' 'If not specified, the segments will be uploaded to a ' - '<container>_segments container so as to not pollute the main ' + '<container>_segments container to not pollute the main ' '<container> listings.') parser.add_option( '', '--leave-segments', action='store_true', |