From b36b477e8106978669f653e4721ff023006772c6 Mon Sep 17 00:00:00 2001
From: Tang Chen <tangchen@cn.fujitsu.com>
Date: Tue, 17 Nov 2015 21:41:47 +0800
Subject: Add --marker option to "server list" command.

This option will give user a chance to display the server list
from wherever they want.

Change-Id: I92cca5e98cd473f1113a9106eb9d1f490694b1fe
---
 doc/source/command-objects/server.rst | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'doc/source/command-objects')

diff --git a/doc/source/command-objects/server.rst b/doc/source/command-objects/server.rst
index 6ae4d254..41d484ee 100644
--- a/doc/source/command-objects/server.rst
+++ b/doc/source/command-objects/server.rst
@@ -187,6 +187,7 @@ List servers
         [--all-projects]
         [--project <project> [--project-domain <project-domain>]]
         [--long]
+        [--marker <server>]
 
 .. option:: --reservation-id <reservation-id>
 
@@ -250,6 +251,11 @@ List servers
 
     List additional fields in output
 
+.. option:: --marker <server>
+
+    The last server (name or ID) of the previous page. Display list of servers
+    after marker. Display all servers if not specified.
+
 server lock
 -----------
 
-- 
cgit v1.2.1


From 43c11c356b92e11a27179a02d2aab1b56fe3bc07 Mon Sep 17 00:00:00 2001
From: Tang Chen <tangchen@cn.fujitsu.com>
Date: Tue, 17 Nov 2015 21:44:02 +0800
Subject: Add --limit option to "server list" command.

This option will limit the total amount of items the command will list up.

Change-Id: I46af0d479d795ebb6a74585d0f76629dd940b117
---
 doc/source/command-objects/server.rst | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'doc/source/command-objects')

diff --git a/doc/source/command-objects/server.rst b/doc/source/command-objects/server.rst
index 41d484ee..afa328ba 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
 -----------
 
-- 
cgit v1.2.1