summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2012-08-14 15:56:14 +0000
committerGerrit Code Review <review@openstack.org>2012-08-14 15:56:14 +0000
commit444b1bf04d718b34a6b82a785afe641c01e92ee7 (patch)
tree34078b97a3cf116315a33f0d6988916f9fe4c255
parent710909b57f1a365f156f07a281712fac8da6de7e (diff)
parent65255ae22b1816bf61922b88c69cf35459d0e508 (diff)
downloadnova-444b1bf04d718b34a6b82a785afe641c01e92ee7.tar.gz
nova-444b1bf04d718b34a6b82a785afe641c01e92ee7.tar.xz
nova-444b1bf04d718b34a6b82a785afe641c01e92ee7.zip
Merge "Allow stop API to be called in Error"
-rw-r--r--doc/source/devref/vmstates.rst1
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/source/devref/vmstates.rst b/doc/source/devref/vmstates.rst
index 9733b44a9..80075124f 100644
--- a/doc/source/devref/vmstates.rst
+++ b/doc/source/devref/vmstates.rst
@@ -81,6 +81,7 @@ task states for various commands issued by the user:
stop -> stopped
stop -> error
active -> stop
+ error -> stop
rescue [shape="rectangle"]
rescue -> rescued