summaryrefslogtreecommitdiff
path: root/doc/source
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-04-06 18:46:14 +0000
committerGerrit Code Review <review@openstack.org>2016-04-06 18:46:14 +0000
commit523ab58fb682efe7f0ac6fcf4746d2d434c7b5ac (patch)
treee61f630a5297ebddea0d79a8a7fb0b8291e42a82 /doc/source
parent81e37a2dce174a1f8e2f1da6aebd9c921bf5f7de (diff)
parent4d3f996e7ce5385688f6e570b8ac73327bac9f44 (diff)
downloadpython-openstackclient-523ab58fb682efe7f0ac6fcf4746d2d434c7b5ac.tar.gz
Merge "Log hint when --enable present with --disable-reason"
Diffstat (limited to 'doc/source')
-rw-r--r--doc/source/command-objects/compute-service.rst5
1 files changed, 3 insertions, 2 deletions
diff --git a/doc/source/command-objects/compute-service.rst b/doc/source/command-objects/compute-service.rst
index db75bef4..bda64c81 100644
--- a/doc/source/command-objects/compute-service.rst
+++ b/doc/source/command-objects/compute-service.rst
@@ -36,7 +36,7 @@ List service command
.. _compute-service-list:
.. option:: --host <host>
- List services on specified host (name only)
+ List services on specified host (name only)
.. option:: --service <service>
@@ -71,7 +71,8 @@ Set service command
.. option:: --disable-reason <reason>
- Reason for disabling the service (in quotes)
+ Reason for disabling the service (in quotes). Note that when the service
+ is enabled, this option is ignored.
.. describe:: <host>