diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-10-17 12:15:14 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-10-17 12:15:14 +0000 |
| commit | f03cd87aba59e41784fb949d0706bc3489cd2674 (patch) | |
| tree | e6233cc33215babd0dcc38d9c40dd4a220e51cff | |
| parent | ab9cfc4dc420a2547e6f6a2e0f2aef89cec08466 (diff) | |
| parent | 928fecd134d9e328a3d4e7f91797b11503e8a70a (diff) | |
| download | python-openstackclient-f03cd87aba59e41784fb949d0706bc3489cd2674.tar.gz | |
Merge "Update the doc for Zaqar v2"
| -rw-r--r-- | doc/source/commands.rst | 5 | ||||
| -rw-r--r-- | doc/source/plugin-commands.rst | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/doc/source/commands.rst b/doc/source/commands.rst index 53272f68..de473a06 100644 --- a/doc/source/commands.rst +++ b/doc/source/commands.rst @@ -159,6 +159,7 @@ list check out :doc:`plugin-commands`. * ``action definition``: (**Workflow Engine (Mistral)**) * ``action execution``: (**Workflow Engine (Mistral)**) * ``baremetal``: (**Baremetal (Ironic)**) +* ``claim``: (**Messaging (Zaqar)**) * ``cluster``: (**Clustering (Senlin)**) * ``cluster action``: (**Clustering (Senlin)**) * ``cluster event``: (**Clustering (Senlin)**) @@ -180,7 +181,8 @@ list check out :doc:`plugin-commands`. * ``dataprocessing image tags``: (**Data Processing (Sahara)**) * ``dataprocessing plugin``: (**Data Processing (Sahara)**) * ``message-broker cluster``: (**Message Broker (Cue)**) -* ``message flavor``: (**Messaging (Zaqar)**) +* ``messaging``: (**Messaging (Zaqar)**) +* ``messaging flavor``: (**Messaging (Zaqar)**) * ``network subport``: (**Networking (Neutron)**) * ``network trunk``: (**Networking (Neutron)**) * ``orchestration resource``: (**Orchestration (Heat)**) @@ -200,6 +202,7 @@ list check out :doc:`plugin-commands`. * ``stack resource``: (**Orchestration (Heat)**) * ``stack snapshot``: (**Orchestration (Heat)**) * ``stack template``: (**Orchestration (Heat)**) +* ``subscription``: (**Messaging (Zaqar)**) * ``task execution``: (**Workflow Engine (Mistral)**) * ``tld``: (**DNS (Designate)**) * ``workbook``: (**Workflow Engine (Mistral)**) diff --git a/doc/source/plugin-commands.rst b/doc/source/plugin-commands.rst index 616d2f0f..7428b34d 100644 --- a/doc/source/plugin-commands.rst +++ b/doc/source/plugin-commands.rst @@ -105,5 +105,5 @@ senlin zaqar ----- -.. list-plugins:: openstack.messaging.v1 +.. list-plugins:: openstack.messaging.v2 :detailed: |