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

@ -139,7 +139,7 @@ def _set_tenant_id(module):
_os_tenant_id = tenant.id
break
if not _os_tenant_id:
module.fail_json(msg = "The tenant id cannot be found, please check the paramters")
module.fail_json(msg = "The tenant id cannot be found, please check the parameters")
def _get_router_id(module, neutron):