diff options
| author | Zuul <zuul@review.opendev.org> | 2019-09-11 19:35:52 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-09-11 19:35:52 +0000 |
| commit | aa64eb6b0acc6e049c81fd856b75cda2f905c84c (patch) | |
| tree | 3d0e2bd698dc2137ef4ac9ffb274d86bd7389ef9 /doc | |
| parent | 06b49c03ddc6264e231a2f5c1688c2791cab64b5 (diff) | |
| parent | cb0c20b23c564dc6b260492923aef58ee66620d9 (diff) | |
| download | python-openstackclient-4.0.0.tar.gz | |
Merge "Update release table for Train and 4.0.0"4.0.0
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/source/cli/authentication.rst | 2 | ||||
| -rw-r--r-- | doc/source/index.rst | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/doc/source/cli/authentication.rst b/doc/source/cli/authentication.rst index f8aaadf4..3b404bce 100644 --- a/doc/source/cli/authentication.rst +++ b/doc/source/cli/authentication.rst @@ -67,8 +67,6 @@ by the ``ClientManager`` object. is selected based on the existing options. This is a short-circuit evaluation, the first match wins. - * If ``--os-url`` and ``--os-token`` are both present ``token_endpoint`` - is selected * If ``--os-username`` is supplied ``password`` is selected * If ``--os-token`` is supplied ``token`` is selected * If no selection has been made by now exit with error diff --git a/doc/source/index.rst b/doc/source/index.rst index abe08033..ea4cd3e9 100644 --- a/doc/source/index.rst +++ b/doc/source/index.rst @@ -55,7 +55,7 @@ Contributing OpenStackClient utilizes all of the usual OpenStack processes and requirements for contributions. The code is hosted `on OpenStack's Git server`_. `Bug reports`_ -and `blueprints`_ may be submitted to the :code:`python-openstackclient` project +may be submitted to the :code:`python-openstackclient` Storyboard project on `Launchpad`_. Code may be submitted to the :code:`openstack/python-openstackclient` project using `Gerrit`_. Developers may also be found in the `IRC channel`_ ``#openstack-sdks``. @@ -64,7 +64,6 @@ Developers may also be found in the `IRC channel`_ ``#openstack-sdks``. .. _Launchpad: https://launchpad.net/python-openstackclient .. _Gerrit: http://docs.openstack.org/infra/manual/developers.html#development-workflow .. _Bug reports: https://storyboard.openstack.org/#!/project/975 -.. _blueprints: https://blueprints.launchpad.net/python-openstackclient .. _PyPi: https://pypi.org/project/python-openstackclient .. _tarball: http://tarballs.openstack.org/python-openstackclient .. _IRC channel: https://wiki.openstack.org/wiki/IRC |