internet/community.general
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-05-06 13:22:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
parent 7806c5095d 4e0c01bcbf
commit 3bead39c75
36 changed files with 54 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/inventory/docker.yml
View File

@@ -112,7 +112,7 @@
#
#
#
# The Docker inventory plugin provides several enviroment variables that
# The Docker inventory plugin provides several environment variables that
# may be overridden here. This configuration file always takes precedence
# over environment variables.
#
@@ -131,4 +131,4 @@ hosts:
# timeout: 60
# private_ssh_port: 2022
# default_ip: 172.16.3.45
# - host: tcp://localhost:4243
# - host: tcp://localhost:4243

2
plugins/inventory/vmware.py
View File

@@ -193,7 +193,7 @@ if __name__ == '__main__':
client = Client( host,user,password )
except Exception, e:
client = None
#print >> STDERR "Unable to login (only cache avilable): %s", str(e)
#print >> STDERR "Unable to login (only cache available): %s", str(e)
# Actually do the work
if hostname is None: