James Cammarata
687753e4cb
Fixing up some search/replace errors regarding user/remote_user
2013-09-18 12:22:41 -05:00
Michael DeHaan
39659db72a
Merge pull request #4148 from ralphbean/digital_ocean_cleanup
...
Cosmetic - Digital ocean cleanup
2013-09-18 08:12:44 -07:00
Ralph Bean
a1ea15141e
Remove trailing whitespace in digital ocean module.
2013-09-18 11:06:32 -04:00
Ralph Bean
3eab663f2e
Remove duplicate docs in digital ocean module.
...
The EXAMPLES block here has two copies of the same docs,
one nicely formatted, the other less so.
It looks like a pass was made to clean up the docs but the old
cruftier ones were never removed.
2013-09-18 11:05:06 -04:00
Michael DeHaan
31ec42ef92
Merge pull request #4145 from resmo/fix/zabbix-inventory-stderr
...
zabbix inventory: print errors to stderr
2013-09-18 05:00:42 -07:00
René Moser
269ceada78
zabbix inventory: print errors to stderr
2013-09-18 09:56:30 +02:00
Stephen Fromm
27b5c2e28c
Fix how module_common handles selevel (issue #4142 )
...
Two fixes:
* parameter name is selevel, not serange.
* Fix split on selinux context to limit to max of 4 since the selevel
may contain ':' characters. This was fixed in
selinux_default_context() and selinux_context().
2013-09-17 14:47:00 -07:00
James Cammarata
671eeb65b2
Merge pull request #4138 from resmo/fix/redundant-fail-json
...
apt: fixed duplicate fail_json
2013-09-17 06:08:51 -07:00
Rene Moser
9449d62fb2
apt: fixed duplicate fail_json
2013-09-17 15:05:20 +02:00
Michael DeHaan
d27f6e037e
Merge pull request #4135 from shuhaowu/patch-1
...
Fixed monit restarted error.
2013-09-16 17:00:41 -07:00
Shuhao Wu
0d2a3f1b0c
Fixed monit restarted error.
...
Errors everytime...
2013-09-16 19:14:17 -04:00
James Cammarata
c934d4a383
Added standardized includes to the CHANGELOG
2013-09-16 16:32:32 -05:00
James Cammarata
458f71b53c
Merge branch 'issue_4129_role_defaults_empty_yaml' into devel
...
Conflicts:
lib/ansible/playbook/play.py
2013-09-16 16:21:06 -05:00
James Cammarata
091a90ee8b
Allow includes to follow the standard format
...
Previously, includes had to receive variables via a special 'vars'
field. With this patch, the include syntax becomes a more natural
datastructure without special fields and is more akin to the way
role includes/dependencies work.
Tested with the following playbook:
---
- hosts: localhost
connection: local
tasks:
- { include: inc1.yml, a: 1 }
- include: inc2.yml
b: 2
- include: inc3.yml
with_items:
- x
- y
- z
Fixes #3481
2013-09-16 16:12:36 -05:00
James Cammarata
c5bb1394b9
Check to make sure default_vars in the datastructure isn't empty
...
Fixes #4129
2013-09-16 13:16:06 -05:00
Michael DeHaan
4d352e69fc
Update CHANGELOG.md
2013-09-16 10:53:56 -04:00
James Cammarata
f4c5f37ca6
Merge branch 'issue_3417_systemd_stuff' into devel
2013-09-16 09:30:39 -05:00
James Cammarata
5b15010099
Merge branch 'issue_3312_role_links' into devel
2013-09-16 09:29:25 -05:00
James Cammarata
02033f9ec8
Merge branch 'archlinux-fact' of https://github.com/Schnouki/ansible into Schnouki-archlinux-fact
2013-09-16 07:45:38 -05:00
James Cammarata
cc8d601fb6
Updated CHANGELOG for the failed_when feature
2013-09-16 07:39:22 -05:00
James Cammarata
3b801dec72
Merge branch 'failed_when' of https://github.com/hnakamur/ansible into hnakamur-failed_when
2013-09-16 07:35:34 -05:00
James Cammarata
105e2f916e
Merge branch 'devel' of https://github.com/r-p-e/ansible into r-p-e-devel
2013-09-16 06:55:45 -05:00
James Cammarata
c6fdb85d88
Merge branch 'issue_3421_apt_pkg_iU' into devel
2013-09-16 06:54:05 -05:00
James Cammarata
e3bbb92005
Updating CHANGELOG for the recent commits
2013-09-16 06:20:37 -05:00
James Cammarata
fcc18fa105
Merge branch 'subelements' of https://github.com/sergevanginderachter/ansible into sergevanginderachter-subelements
2013-09-16 06:14:42 -05:00
James Cammarata
25c102d4d8
Adding a note in the documentation regarding user->remote_user change
2013-09-16 06:03:15 -05:00
James Cammarata
aac3090909
Merge branch 'play_remote_user' of https://github.com/bcoca/ansible into bcoca-play_remote_user
2013-09-16 05:55:14 -05:00
James Cammarata
3848e02959
Merge branch 'issue4022' of https://github.com/sfromm/ansible into sfromm-issue4022
...
Conflicts:
lib/ansible/runner/connection_plugins/accelerate.py
2013-09-16 05:50:35 -05:00
James Cammarata
cee2bddc24
Updated version_added string for the new validate_md5 option
2013-09-16 05:42:13 -05:00
James Cammarata
d9cf1dfefb
Merge branch 'fetch' of https://github.com/bpennypacker/ansible into bpennypacker-fetch
2013-09-16 05:39:48 -05:00
James Cammarata
f4b3defcbf
Set sudo in accelerate commands correctly
...
Fixes #4111
2013-09-15 20:20:22 -05:00
r-p-e
338ecdd578
Simplify the selection of date command
...
- use egrep patterns to detect BSDs in one ifeq
- use seconds-since-epoch as input for BSD date (-r option)
- get seconds-since-epoch from git log with "%at" format string
2013-09-15 21:27:18 +02:00
Michael DeHaan
f93ef96a08
Merge pull request #4115 from r-p-e/devel
...
Add some more OpenBSD facts
2013-09-15 10:29:40 -07:00
Michael DeHaan
5c0dd958e5
Merge pull request #4028 from willthames/lineinfile_userdir
...
Expand tilde in paths in file module
2013-09-15 09:33:49 -07:00
Michael DeHaan
00c0770f1b
Merge pull request #4075 from sayap/easy_install
...
Locate easy_install path after (optionally) creating virtualenv.
2013-09-15 09:29:51 -07:00
r-p-e
2f887c6dca
Add some more OpenBSD facts
...
added:
* ansible_distribution
* ansible_distribution_release
* ansible_distribution_version
2013-09-15 17:58:29 +02:00
Michael DeHaan
a563ea1340
Update CONTRIBUTING.md
2013-09-13 21:26:49 -04:00
Michael DeHaan
81155ee29f
Update CONTRIBUTING.md
2013-09-13 21:03:33 -04:00
Michael DeHaan
7f972522c8
Update CONTRIBUTING.md
2013-09-13 20:47:22 -04:00
Michael DeHaan
33e80a812c
Update CONTRIBUTING.md
...
edit doc some more, remove line break
2013-09-13 20:28:57 -04:00
Michael DeHaan
44724206d1
Update CONTRIBUTING.md
2013-09-13 20:28:26 -04:00
Michael DeHaan
970bf3a45a
Update README.md
2013-09-13 20:28:00 -04:00
Michael DeHaan
7c09ba1173
Update CONTRIBUTING.md
...
formatting, add twitter link
2013-09-13 20:25:02 -04:00
Michael DeHaan
7495ad5a21
Update CONTRIBUTING.md
...
word wrap and formatting
2013-09-13 20:23:44 -04:00
Michael DeHaan
87d9462d99
Update CONTRIBUTING.md
...
Convert URLs to short form hyperlinks
2013-09-13 20:19:04 -04:00
Michael DeHaan
8b4fbcbb97
Update CONTRIBUTING.md
...
URL formatting
2013-09-13 20:16:22 -04:00
Michael DeHaan
9a0b09f792
Update CONTRIBUTING.md
...
Github formatting fixups
2013-09-13 20:15:42 -04:00
Michael DeHaan
b0efae1aac
Update CONTRIBUTING.md
...
Add URLs to mailing lists instead so it's obvious on how to subscribe
2013-09-13 20:12:53 -04:00
Michael DeHaan
e9810bcd1e
Update CONTRIBUTING.md
2013-09-13 20:10:50 -04:00
James Cammarata
8283183023
Adding sshpass as packaging requirement and fixing VERSION
2013-09-13 17:39:14 -05:00