diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-11-17 02:26:15 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-11-17 02:26:15 +0000 |
| commit | 74d53cdd5070e6992e8acabd6984bb2e1658d341 (patch) | |
| tree | 2b1ebc0e51997947ad12978c943abb90d74121e4 /doc | |
| parent | 5dffc9d860c3f6728c63b7cf1b1c4a662393e9e7 (diff) | |
| parent | 91fbb0e1361fe24273ace0e5f5e7d338aefbe168 (diff) | |
| download | python-openstackclient-74d53cdd5070e6992e8acabd6984bb2e1658d341.tar.gz | |
Merge "Enable "openstack server unlock" command to take multiple servers."
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/source/command-objects/server.rst | 6 | ||||
| -rw-r--r-- | doc/source/commands.rst | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/doc/source/command-objects/server.rst b/doc/source/command-objects/server.rst index d8b3dbcb..4aeef4d0 100644 --- a/doc/source/command-objects/server.rst +++ b/doc/source/command-objects/server.rst @@ -643,17 +643,17 @@ Suspend server server unlock ------------- -Unlock server +Unlock server(s) .. program:: server unlock .. code:: bash os server unlock - <server> + <server> [<server> ...] .. describe:: <server> - Server (name or ID) + Server(s) to unlock (name or ID) server unpause -------------- diff --git a/doc/source/commands.rst b/doc/source/commands.rst index ca60ab8e..e69699b1 100644 --- a/doc/source/commands.rst +++ b/doc/source/commands.rst @@ -186,7 +186,7 @@ Those actions with an opposite action are noted in parens if applicable. * ``start`` (``stop``) - start one or more servers * ``stop`` (``start``) - stop one or more servers * ``suspend`` (``resume``) - stop a server and save to disk freeing memory -* ``unlock`` (``lock``) - unlock a server +* ``unlock`` (``lock``) - unlock one or more servers * ``unpause`` (``pause``) - return one or more paused servers to running state * ``unrescue`` (``rescue``) - return a server to normal boot mode * ``unset`` (``set``) - remove an attribute of the object |