diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-04-09 03:43:02 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-04-09 03:43:02 +0000 |
| commit | 600657ebdcef5014dbcd14d12c2cb8100efe976b (patch) | |
| tree | c1d193d5fc3229d7a30c8353a5e085fc6aff5aac | |
| parent | d6ce587e95527c2c1aaeb2ce28afdcc64b32563f (diff) | |
| parent | 2ea94891ea964710ea76e774a805bdff589a0b80 (diff) | |
| download | python-ceilometerclient-600657ebdcef5014dbcd14d12c2cb8100efe976b.tar.gz | |
Merge "fix client docstring"
| -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 3237808..ff2e862 100644 --- a/ceilometerclient/client.py +++ b/ceilometerclient/client.py @@ -284,7 +284,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 ============ |