diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-11-16 03:28:01 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-11-16 03:28:01 +0000 |
| commit | 5dffc9d860c3f6728c63b7cf1b1c4a662393e9e7 (patch) | |
| tree | ba72789b05751a5b4309be5b6d5876e11443aa88 /doc | |
| parent | f177160991e91e847db24b173a1c42c34ee03b12 (diff) | |
| parent | c1f0ad6d714b1cb9cb9f9ba25c02243a0c5b7d66 (diff) | |
| download | python-openstackclient-5dffc9d860c3f6728c63b7cf1b1c4a662393e9e7.tar.gz | |
Merge "Enable "openstack server lock" 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 211963f3..d8b3dbcb 100644 --- a/doc/source/command-objects/server.rst +++ b/doc/source/command-objects/server.rst @@ -253,17 +253,17 @@ List servers server lock ----------- -Lock a server. A non-admin user will not be able to execute actions +Lock server(s). A non-admin user will not be able to execute actions .. program:: server lock .. code:: bash os server lock - <server> + <server> [<server> ...] .. describe:: <server> - Server (name or ID) + Server(s) to lock (name or ID) server migrate -------------- diff --git a/doc/source/commands.rst b/doc/source/commands.rst index 62ed7652..ca60ab8e 100644 --- a/doc/source/commands.rst +++ b/doc/source/commands.rst @@ -169,7 +169,7 @@ Those actions with an opposite action are noted in parens if applicable. * ``delete`` (``create``) - delete specific occurrences of the specified objects * ``issue`` (``revoke``) - issue a token * ``list`` - display summary information about multiple objects -* ``lock`` (``unlock``) - lock a server so that non-admin user won't be able to execute actions +* ``lock`` (``unlock``) - lock one or more servers so that non-admin user won't be able to execute actions * ``migrate`` - move a server to a different host; ``--live`` performs a live migration if possible * ``pause`` (``unpause``) - stop one or more servers and leave them in memory |