diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-04-20 17:32:14 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-04-20 17:32:14 +0000 |
| commit | b00e34428cc2650b13bdfda43549ce60616afe05 (patch) | |
| tree | 8fe5bab4cce57e16cfccfa920ddbf971d4df0571 | |
| parent | 2f238c6d970e93a5297956e891206af2a1a3dd32 (diff) | |
| parent | 5a3697d0b95b3d9919d702a9017c378ace98e429 (diff) | |
| download | python-ceilometerclient-b00e34428cc2650b13bdfda43549ce60616afe05.tar.gz | |
Merge "fix client docstring" into stable/kilo
| -rw-r--r-- | ceilometerclient/client.py | 2 | ||||
| -rw-r--r-- | doc/ext/gen_ref.py | 5 | ||||
| -rw-r--r-- | doc/source/index.rst | 1 |
3 files changed, 2 insertions, 6 deletions
diff --git a/ceilometerclient/client.py b/ceilometerclient/client.py index c0a8be5..46cd66f 100644 --- a/ceilometerclient/client.py +++ b/ceilometerclient/client.py @@ -256,7 +256,9 @@ def get_client(version, **kwargs): * ceilometer_url: (DEPRECATED) Ceilometer API endpoint, use os_endpoint instead * os_endpoint: Ceilometer API endpoint + or: + * os_username: name of user * os_password: user's password * os_user_id: user's id diff --git a/doc/ext/gen_ref.py b/doc/ext/gen_ref.py index f3ea677..f8560b3 100644 --- a/doc/ext/gen_ref.py +++ b/doc/ext/gen_ref.py @@ -52,8 +52,3 @@ def gen_ref(ver, title, names): % {"title": name.capitalize(), "signs": "=" * len(name), "pkg": pkg, "name": name}) - -gen_ref("", "Client Reference", ["client", "exc"]) -gen_ref("v1", "Version 1 API Reference", - ["stacks", "resources", "events", "actions", - "software_configs", "software_deployments"]) diff --git a/doc/source/index.rst b/doc/source/index.rst index 56f671a..cec3b5c 100644 --- a/doc/source/index.rst +++ b/doc/source/index.rst @@ -24,7 +24,6 @@ Contents: ref/index ref/v1/index ref/v2/index - releases Contributing ============ |