summaryrefslogtreecommitdiff
path: root/doc/source/command-objects
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-12-01 03:00:52 +0000
committerGerrit Code Review <review@openstack.org>2015-12-01 03:00:52 +0000
commitb221f2ceac6f7b1d9ba381f1a142fc0dbaf4f262 (patch)
treeab432ad4d4e8f4aeb34f56f66e7af69d015ddd27 /doc/source/command-objects
parentfc299fd19078e2c705ba1d2be2c5916eb1e1764b (diff)
parent43c11c356b92e11a27179a02d2aab1b56fe3bc07 (diff)
downloadpython-openstackclient-b221f2ceac6f7b1d9ba381f1a142fc0dbaf4f262.tar.gz
Merge "Add --limit option to "server list" command."
Diffstat (limited to 'doc/source/command-objects')
-rw-r--r--doc/source/command-objects/server.rst7
1 files changed, 7 insertions, 0 deletions
diff --git a/doc/source/command-objects/server.rst b/doc/source/command-objects/server.rst
index 405c1830..70b47482 100644
--- a/doc/source/command-objects/server.rst
+++ b/doc/source/command-objects/server.rst
@@ -188,6 +188,7 @@ List servers
[--project <project> [--project-domain <project-domain>]]
[--long]
[--marker <server>]
+ [--limit <limit>]
.. option:: --reservation-id <reservation-id>
@@ -256,6 +257,12 @@ List servers
The last server (name or ID) of the previous page. Display list of servers
after marker. Display all servers if not specified.
+.. option:: --limit <limit>
+
+ Maximum number of servers to display. If limit equals -1, all servers will
+ be displayed. If limit is greater than 'osapi_max_limit' option of Nova
+ API, 'osapi_max_limit' will be used instead.
+
server lock
-----------