Merge branch 'spelling' of git://github.com/cgar/ansible into devel

Conflicts:
	docsite/rst/guide_rax.rst
	plugins/callbacks/mail.py
This commit is contained in:
Michael DeHaan 2014-08-08 13:28:45 -04:00
commit 3bead39c75
36 changed files with 54 additions and 54 deletions

View file

@ -164,7 +164,7 @@
that:
- "file11_result.uid == 1235"
- name: fail to create soft link to non existant file
- name: fail to create soft link to non existent file
file: src=/noneexistant dest={{output_dir}}/soft2.txt state=link force=no
register: file12_result
ignore_errors: true
@ -174,7 +174,7 @@
that:
- "file12_result.failed == true"
- name: force creation soft link to non existant
- name: force creation soft link to non existent
file: src=/noneexistant dest={{output_dir}}/soft2.txt state=link force=yes
register: file13_result

View file

@ -64,7 +64,7 @@
stat: path={{ checkout_dir }}/.git/branches
register: branches
- name: assert presense of tags/trunk/branches
- name: assert presence of tags/trunk/branches
assert:
that:
- "tags.stat.isdir"

View file

@ -62,7 +62,7 @@
- debug: var=tags
- debug: var=branches
- name: assert presense of tags/trunk/branches
- name: assert presence of tags/trunk/branches
assert:
that:
- "tags.stat.isreg"

View file

@ -63,11 +63,11 @@
# now remove it to test uninstallation of a package we are sure is installed
- name: now uninstall so we can see that a change occured
- name: now uninstall so we can see that a change occurred
pip: name={{ pip_test_package }} state=absent
register: absent2
- name: assert a change occured on uninstallation
- name: assert a change occurred on uninstallation
assert:
that:
- "absent2.changed"

View file

@ -77,7 +77,7 @@
stat: path={{ checkout_dir }}/branches
register: branches
- name: assert presense of tags/trunk/branches
- name: assert presence of tags/trunk/branches
assert:
that:
- "tags.stat.isdir"

View file

@ -1,4 +1,4 @@
# order of groups, children, and vars is not signficant
# order of groups, children, and vars is not significant
# so this example mixes them up for maximum testing
[nc:children]