summaryrefslogtreecommitdiff
path: root/doc/source
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-11-24 23:23:30 +0000
committerGerrit Code Review <review@openstack.org>2015-11-24 23:23:30 +0000
commit13dfacc5ff6cd4c55a46bae16c12c1a0ed291ce0 (patch)
treebac7b181020b7f211c36d9fa7c24acd44066a023 /doc/source
parentb42396d445de9536660ff6930aa572c8ff99b4da (diff)
parenta41a8c42af47ea51782f90221e987287484a26d7 (diff)
downloadpython-openstackclient-13dfacc5ff6cd4c55a46bae16c12c1a0ed291ce0.tar.gz
Merge "Add "openstack server shelve" into OSC"
Diffstat (limited to 'doc/source')
-rw-r--r--doc/source/command-objects/server.rst15
-rw-r--r--doc/source/commands.rst1
2 files changed, 16 insertions, 0 deletions
diff --git a/doc/source/command-objects/server.rst b/doc/source/command-objects/server.rst
index ed96286b..6ae4d254 100644
--- a/doc/source/command-objects/server.rst
+++ b/doc/source/command-objects/server.rst
@@ -495,6 +495,21 @@ Resume server(s)
Server(s) to resume (name or ID)
+server shelve
+-------------
+
+Shelve server(s)
+
+.. program:: server shelve
+.. code:: bash
+
+ os server shelve
+ <server> [<server> ...]
+
+.. describe:: <server>
+
+ Server(s) to shelve (name or ID)
+
server set
----------
diff --git a/doc/source/commands.rst b/doc/source/commands.rst
index 44be8bc7..971739de 100644
--- a/doc/source/commands.rst
+++ b/doc/source/commands.rst
@@ -183,6 +183,7 @@ Those actions with an opposite action are noted in parens if applicable.
* ``revoke`` (``issue``) - revoke a token
* ``save`` - download an object locally
* ``set`` (``unset``) - set a property on the object, formerly called metadata
+* ``shelve`` (``unshelve``) - shelve one or more server
* ``show`` - display detailed information about the specific object
* ``start`` (``stop``) - start one or more servers
* ``stop`` (``start``) - stop one or more servers