summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Coca <bcoca@ansible.com>2015-03-27 20:18:25 -0400
committerBrian Coca <bcoca@ansible.com>2015-03-27 20:18:25 -0400
commit1c5cef0ee9ab841ee78acef5f1d4d69b03db1b91 (patch)
tree814c3716d9fd0c5249a1fb922213cc1ee0392e4b
parentbbf2ec2501824eeacf02c72cfea812ef0d5b1557 (diff)
parent5320cc93e6f54373a23fd483da7cbe53bb657942 (diff)
downloadansible-modules-core-1c5cef0ee9ab841ee78acef5f1d4d69b03db1b91.tar.gz
Merge pull request #1019 from rtrauntvein/patch-1
Specify that "state: reloaded" was added in Ansible 1.9
-rw-r--r--cloud/docker/docker.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/cloud/docker/docker.py b/cloud/docker/docker.py
index 85eb0525..7eea7888 100644
--- a/cloud/docker/docker.py
+++ b/cloud/docker/docker.py
@@ -181,7 +181,7 @@ options:
- Assert the container's desired state. "present" only asserts that the
matching containers exist. "started" asserts that the matching
containers both exist and are running, but takes no action if any
- configuration has changed. "reloaded" asserts that all matching
+ configuration has changed. "reloaded" (added in Ansible 1.9) asserts that all matching
containers are running and restarts any that have any images or
configuration out of date. "restarted" unconditionally restarts (or
starts) the matching containers. "stopped" and '"killed" stop and kill