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