ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity
4537 commits 10 branches 167 tags 272 MiB
Commit graph

1381 commits

Author SHA1 Message Date
Daniel Hokka Zakrisson
fc227fbd37 Restore force in copy since arguments are no longer clobbered 
Fixes #2388.
 2013-03-14 11:27:49 +01:00
Alexander Bulimov
902d6347c7 now using 'type=' for module parameters, replaced lambda with list comprehensions, simplyfied extend/reduce part of module, renamed dev parameter to pvs 2013-03-14 13:32:16 +04:00
Jimmy Tang
32bf6050c7 Teach the macports module to activate/deactivate packages 
Deactivating a package from macports does not remove the files, it
just unstages it from the runtime environment. Activating a package
re-enables it.
 2013-03-14 08:14:57 +00:00
David Hughes
08100bd798 Expand any user home variable in pip module's virtualenv parameter 2013-03-13 20:58:04 -07:00
Michael DeHaan
b87e7c0f19 Let the pip module return output. 2013-03-13 22:25:58 -04:00
Brian Coca
4f9c61d673 now actually import exception to be usable 2013-03-13 18:21:16 -04:00
Brian Coca
4a2276bb4b now catches lock exceptoins on apt and returns friendly message instead of 
traceback

Signed-off-by: Brian Coca <briancoca+dev@gmail.com>
 2013-03-13 18:11:23 -04:00
Brian Coca
3313667dcf added docs about in template overrides 
Signed-off-by: Brian Coca <bcoca@tablethotels.com>
 2013-03-13 15:58:08 -04:00
Michael DeHaan
f46721add1 Temporarily disable force logic on copy module 2013-03-13 13:35:33 -04:00
Michael DeHaan
e307658350 Merge pull request #2376 from peterjanes/devel 
Use login_host for import and dump operations
 2013-03-12 12:40:34 -07:00
Patrik Lundin
88a840e52f Dont exit in FreeBSD/NetBSD subclass in check mode 
* As the FIXMEs note: only exit if enable state is going to change.
* This is already handled in service_enable_rcconf() being called by both subclasses.
 2013-03-12 20:25:25 +01:00
Peter Janes
f6f7d3559d Use login_host for import and dump operations 2013-03-12 12:07:16 -04:00
Dag Wieers
50b7964f8e Fix the documentation booleans so they use "yes" and "no" 
Both modules seboolean and zfs have not been adapted since they defer from the default (either by having a 'null' or special state, or prefering "on"/"off" for state indication.
 2013-03-12 13:25:59 +01:00
Alexander Bulimov
c8c0fe945b various fixes in lvg module, added ability to reduce and extend VG, added Physical Extent parameter, added explicit creation of physical volumes 2013-03-12 14:06:39 +04:00
André Paramés
264d83c0a3 Added Bazaar module, based on the Git module 2013-03-11 23:13:17 +00:00
Alexander Bulimov
259d994253 lvg module for managing LVM volume groups 2013-03-11 13:17:36 +04:00
Alexander Bulimov
a3b4488028 lvol patch for Debian Squeeze 2013-03-11 12:20:01 +04:00
Michael DeHaan
bdb231213d Add type casting to user/group modules, remove executable bit from other modules 2013-03-18 00:40:57 -04:00
Michael DeHaan
5c7aa08ed5 Merge pull request #2316 from dominis/devel 
Citrix NetScaler module
 2013-03-10 17:17:08 -07:00
Michael DeHaan
8c212ac9b6 Merge pull request #2272 from skvidal/nagios_cmd 
add (un)silence_nagios and command actions to the nagios module
 2013-03-10 17:16:21 -07:00
Michael DeHaan
3d8bb6c2e0 Merge branch 'alpine' of git://github.com/fabaff/ansible into devel 
Conflicts:
	library/setup
 2013-03-17 23:39:33 -04:00
Michael DeHaan
ba51fc12f9 Updated copy documentation. 2013-03-17 23:35:15 -04:00
Patrick Pelletier
c7c7a63ee5 Add support to directly set content in copy module 2013-03-17 23:33:13 -04:00
Michael DeHaan
4da04b2176 Merge pull request #2294 from mmoya/bug-fixes 
file module should check invalid arguments (fixes #2135)
 2013-03-10 16:32:02 -07:00
Michael DeHaan
2d575ddd09 Update fetch documentation 2013-03-17 23:17:56 -04:00
Michael DeHaan
c3e625e6f0 Make URI module default to 30 seconds. 2013-03-17 23:16:45 -04:00
Michael DeHaan
b2c8ed9cc2 Merge pull request #2279 from dorfsmay/fetch-fail_on_missing 
Added a fail_on_missing option to fetch.
 2013-03-10 16:18:28 -07:00
Michael DeHaan
fd038d373a Merge pull request #2273 from dorfsmay/pullreq-use_proxy 
Added a use_proxy option to get_url.
 2013-03-10 16:10:45 -07:00
Michael DeHaan
bb696e88b4 Merge pull request #2286 from gavares/url_timeout 
Add socket timeout to uri module.
 2013-03-10 15:37:32 -07:00
Michael DeHaan
c7d780a09a Merge pull request #2337 from dparalen/wait_fix 
EC2 Wait fix
 2013-03-10 15:28:34 -07:00
Michael DeHaan
033c7d9df2 Merge pull request #2274 from jcftang/setup-osx-facts 
Start of more OSX facts for setup
 2013-03-10 15:26:41 -07:00
Michael DeHaan
80cd277d97 Merge pull request #2334 from pieska/upstream 
allow use of backrefs in lineinfile
 2013-03-10 15:25:25 -07:00
Michael DeHaan
9069ad1f42 Merge pull request #2283 from eest/openbsd_pkg 
Add openbsd_pkg: package management for OpenBSD.
 2013-03-10 15:21:13 -07:00
milan
6259091449 fixed case and punctuation 2013-03-08 10:12:15 +01:00
milan
9932c9ff11 fix documentation 2013-03-08 10:12:15 +01:00
milan
d32d899161 waiting enhancements 2013-03-08 10:12:15 +01:00
milan
78d1e2483a avoid the instance start--state-fetch race 2013-03-08 10:12:15 +01:00
Nikolay Panov
03c0b8dcb2 Fixed 'service'. Now it respect 'enabled=no' as well. 2013-03-08 12:07:54 +07:00
Andreas Piesk
84ee05a3c0 allow use of backrefs in lineinfile 2013-03-07 20:46:52 +01:00
Fabian Affolter
a5e4947d6f Support for detecting Alpine Linux 2013-03-07 20:06:05 +01:00
Michael DeHaan
9763ae8e21 Merge pull request #2319 from sfromm/svn-check 
Update subversion module to work better with check mode
 2013-03-06 21:16:35 -08:00
Michael DeHaan
bd600c1cbc Merge pull request #2323 from laixer/devel 
Respect gem_source option if specified
 2013-03-06 21:16:03 -08:00
Michael DeHaan
9980cfcc60 Merge pull request #2318 from sfromm/issue2317 
Consider service stopped if rc is 1
 2013-03-06 21:07:24 -08:00
Vadim Berezniker
b9a3cc551e Respect gem_source option if specified 2013-03-06 16:58:57 -08:00
Jim Kleckner
92844d3dcd Minor spelling fixes 2013-03-06 10:41:19 -08:00
Stephen Fromm
bd64641400 Update subversion module to work better with check mode 
Adds needs_update() method which will inspect the checkout for the
current revision and then the HEAD.  If the local check out is behind
HEAD, this will report changed=True and supply the revision numbers.
 2013-03-06 10:23:35 -08:00
Stephen Fromm
6e35392f92 Consider service stopped if rc is 1 
Per LSB spec, consider service stopped if rc from 'service status' is 1.
Added comment with url to LSB spec reference.
 2013-03-06 10:18:34 -08:00
Nandor Sivok
74ced2d80c netscaler module initial commit 2013-03-06 15:32:01 +01:00
Daniel Hokka Zakrisson
3d49f74df6 Make apt upgrade=dist work and make its argument handling more idiomatic 
Fixes #2287.
 2013-03-05 23:46:34 +01:00
asad-at-srt
e581bbcafc Update mysql_db 
The target parameter is not required, the DOCUMENTATION section was in error.
 2013-03-05 17:11:12 -05:00
Daniel Hokka Zakrisson
a225058457 Merge pull request #2298 from junegunn/get_url-force 
get_url: should always download the file when force is set
 2013-03-05 12:50:33 -08:00
Seth Vidal
2f2a02cb49 add docs to mount module using LABEL and UUID 2013-03-05 12:13:36 -05:00
Johan Wirén
e53826b088 Corrected formatting in docs for the gem-module 2013-03-05 12:28:04 +01:00
Junegunn Choi
7f556d8939 should always download when force is set 2013-03-05 11:39:50 +09:00
Maykel Moya
ee7f8d018e file module should check invalid arguments (fixes #2135) 2013-03-04 12:55:18 +01:00
Grant Gavares
cd51c7f234 Add socket timeout to uri module. 
The uri module can be configured to abort after a specified timeout if
it cannot connect to the configured uri. This prevents a uri action from
hanging indefinitely when the remote endpoint cannot be reached because
it is unavailable, there is a firewall in place etc. The default behavior
is left unchanged: timeout=None

This change also introduces a new type for module_parameters: int
Code was added to perform conversion from string -> int type in
module_common.py.

The new type was required in order to play nice with httplib2 which
refuses to accept (and convert) anything other than a numeric type for
the timeout value.
 2013-03-02 17:34:23 -08:00
Patrik Lundin
f485eb28f5 Teach setup about OpenBSD package manager. 
* We cannot depend on the path because FreeBSD for example uses the same path.
 2013-03-03 00:02:50 +01:00
Patrik Lundin
eb6398f168 Add openbsd_pkg: package management for OpenBSD. 
* Code influenced by the service module but without classes.
* Thanks to @dhozac for input and review.
* Thanks to @johanwiren for getting me to push this out the door.
 2013-03-03 00:01:02 +01:00
Yves Dorfsman
c9a201eb43 fixed typos 2013-03-02 12:12:25 -07:00
Yves Dorfsman
377351f6fd Clarified that proxy can be changed via an variable. 2013-03-02 11:42:49 -07:00
Yves Dorfsman
e45a0fd61d Added a fail_on_missing option to fetch. 2013-03-02 11:04:48 -07:00
Daniel Hokka Zakrisson
622b8dfe32 Merge pull request #2271 from MWGriffin/patch-1 
Update get_url
 2013-03-02 01:40:31 -08:00
Daniel Hokka Zakrisson
8f917a5a9f slurp: import base64 as module_common no longer does 2013-03-02 10:26:09 +01:00
Jimmy Tang
7653c4ac6c Start of more OSX facts for setup 
Added a Darwin family, commit acc1c004 had added some network facts
but weren't being shown as the Darwin family wasn't in use. This commit
reveals these facts.

A Darwin(Hardware) class has also been created ready to be populated with
hardware facts.
 2013-03-02 08:13:38 +00:00
Yves Dorfsman
3270a0adcd Added a use_proxy option to get_url. 2013-03-02 00:30:28 -07:00
Michael Griffin
5bfd648dc8 Update get_url 
Small syntactic correction: Removed trailing double-quote from example.
 2013-03-01 22:49:00 -08:00
Seth Vidal
677dcc56ae add (un)silence_nagios and command actions to the nagios module 
also fix a typo with the check_mode check
 2013-03-02 01:48:39 -05:00
Michael DeHaan
6ecdef6b88 Type checking on library/apt means the upgrade parameter is now properly True/False 2013-03-01 23:34:27 -05:00
Michael DeHaan
4132f8953e Fixup the rabbitmq YAML documentation so we can generate docs for it. 2013-03-01 19:47:43 -05:00
Michael DeHaan
129e0b8baf Log tracebacks to syslog when using fireball mode. 2013-03-01 18:24:48 -05:00
Michael DeHaan
f9824838c3 Merge pull request #2251 from chrishoffman/rabbitmq 
Rabbitmq parameters module
 2013-03-01 14:58:39 -08:00
Michael DeHaan
6ebf16bf33 Some very minor stylistic tweaks to the gem module. 2013-03-01 17:55:13 -05:00
Michael DeHaan
64c1cc3efd Merge branch 'gem' of git://github.com/johanwiren/ansible into devel 2013-03-01 17:46:12 -05:00
Michael DeHaan
66a596dd5d fix MySQL user doc formatting issue 2013-03-01 17:38:14 -05:00
Michael DeHaan
ff58623f8b Fix apt module documentation formatting. 2013-03-01 17:38:14 -05:00
Michael DeHaan
d04c4ef0c7 Merge pull request #2249 from jcftang/devel 
Use opkg module as basis for macports module
 2013-03-01 14:37:32 -08:00
Michael DeHaan
2994ec022d Merge pull request #2242 from jmandel/devel 
Allow relative creates/removes path with `chdir`
 2013-03-01 14:35:42 -08:00
Michael DeHaan
7749b34546 Merge branch 'new_branch_for_apt_squashed' of git://github.com/RaymiiOrg/ansible-1 into devel 
Conflicts:
	library/apt
 2013-03-01 17:13:42 -05:00
Michael DeHaan
26826c3bde Merge pull request #2235 from marktheunissen/mysql-idempotent-explanation 
Add mysql user documentation about idempotent playbooks
 2013-03-01 13:45:55 -08:00
Michael DeHaan
38ab9b50c7 Merge branch 'setup_network2' of git://github.com/nigelm/ansible into devel 2013-03-01 16:25:25 -05:00
Michael DeHaan
8099e4ac26 Merge pull request #2240 from dorfsmay/pullreq-fetch-doc 
Doc that fetch returns ok when src not present.
 2013-03-01 07:55:37 -08:00
Michael DeHaan
22d20b4994 Merge pull request #2244 from fdavis/virt_doc_fix 
virt module doc fix
 2013-03-01 07:55:05 -08:00
Michael DeHaan
273005a380 Merge pull request #2226 from skinp/openwrt_support 
Adding support for OpenWrt
 2013-03-01 07:50:54 -08:00
Michael DeHaan
d9d5970858 Merge pull request #2222 from sfromm/issue2114 
Update various modules for check_mode
 2013-03-01 07:50:16 -08:00
Jimmy Tang
f32f3fc7e2 Use opkg module as basis for macports module 
This module is pretty simplistic, it is derived from the opkg module.
 2013-03-01 14:07:38 +00:00
Chris Hoffman
79fb0aad28 Adding RabbitMQ module to handle parameters 2013-03-01 08:19:51 -05:00
Johan Wirén
6e44c72761 Removed urlparsing of gemsource. Not needed 2013-03-01 12:24:11 +01:00
Jan-Piet Mens
00bd581945 Add ISO8601 date/time format to setup 
Zulu time and one with microseconds, useful for timestamping
  Add TZ
 2013-03-01 09:40:40 +01:00
fdavis
427b49c12c virt module doc fix 2013-02-28 18:04:25 -08:00
Johan Wirén
637210be1f Added gem module 2013-03-01 02:59:02 +01:00
Chris Hoffman
b1478fdab7 Updating docs 2013-02-28 20:32:44 -05:00
Josh Mandel
7c772c6af5 Add remote user_id to ansible facts 2013-02-28 15:55:31 -08:00
Josh Mandel
6250b64ef9 Use relative creates/removes path with chdir 2013-02-28 14:47:19 -08:00
Michael DeHaan
b5ad1ce768 In django module if no virtualenv is specified, don't choke 2013-02-28 16:03:23 -05:00
Michael DeHaan
1e5d5fc263 Be consistent about underscore usage. 2013-02-28 15:57:27 -05:00
Ton Kersten
7b51f67128 Squashed commit of the following: 
commit 076501459322cf6c14de742e504339d80ffdeed5
Author: Ton Kersten <tonk@tonkersten.com>
Date:   Thu Feb 28 21:32:57 2013 +0100

    Added date and time facts to setup
 2013-02-28 21:33:56 +01:00
Yves Dorfsman
7cedb7d432 Doc that fetch returns ok when src not present. 2013-02-28 13:24:24 -07:00
Mark Theunissen
34bed2fa2e Fix bug from copy-paste 2013-02-28 13:55:22 -06:00
Remy van Elst
f094d65fdd apt update 2013-02-28 20:50:07 +01:00
Remy van Elst
5289fa72b6 apt upgrade support 2013-02-28 20:47:31 +01:00
Mark Theunissen
45949c7643 Add mysql user documentation 2013-02-28 10:25:09 -06:00
Ton Kersten
05c70ca712 Squashed commit of the following: 
commit e057ea671395ec8847f920a63cf9524f5c8fde5f
Author: Ton Kersten <tonk@tonkersten.com>
Date:   Thu Feb 28 13:02:25 2013 +0100

    Fixed the service command not working

    On Ubuntu 1[02].04 the service name was not recognized because
    there is a SysV style init script, but not an upstart config file.

    Example: The `ntp` client.

    Also removed extra spaces at the end of the lines, while at it.
 2013-02-28 13:06:50 +01:00
Nigel Metheringham
e2643cb55f Broke BSD ifconfig parser into chunks for subclassing 
This allows minor changes to be handled by adding a new
parse line function to the subclass
 2013-02-28 09:58:29 +00:00
Nigel Metheringham
acc1c004d4 Restructured inheritance of BSD network classes 
Now all BSD network classes directly inherit from Network as well as from the generic BSD network class.  This removes the need for itersubclasses().
 2013-02-28 09:07:54 +00:00
Patrick Pelletier
2778ee0eb5 Adding support for OpenWrt 2013-02-27 22:16:12 -05:00
Stephen Fromm
8f0d8a8546 Update various modules for check_mode 
This updates the following modules to support check_mode:
* apt_key
* apt_repository
* easy_install
* pip - will always report changed due to the way it handles state
* seboolean
* selinux
* slurp - since nothing changes, it just adds that it supports
  check_mode
* subversion - reports changed when checking out new repo and
  when updating.
* supervisorctl
* svr4pkg

See issue #2114.
 2013-02-27 12:23:35 -08:00
Daniel Hokka Zakrisson
1fe744d2af Fix apt module's boolean check to expect converted value 
Fixes #2218.
 2013-02-27 20:02:34 +01:00
Michael DeHaan
0342b054fd Merge pull request #2215 from tastychutney/devel 
Updated virtualenv note
 2013-02-27 08:42:53 -08:00
Scott Anderson
dc476a12a6 Updated virtualenv note 2013-02-27 10:01:12 -05:00
Michael DeHaan
0fc317de08 Merge pull request #2212 from jhoekx/lvol-module 
Add lvol module to manage logical volumes.
 2013-02-27 05:52:23 -08:00
Daniel Hokka Zakrisson
e33e84d24e Merge pull request #2213 from huberteff/devel 
Work around hanging module.  Thanks to Daniel Hozac for the tip.
 2013-02-27 04:30:39 -08:00
Hubert Feyrer
acf8ee9d61 Work around hanging module. Thanks to Daniel Hozac for the tip. 2013-02-27 13:26:12 +01:00
Jeroen Hoekx
01a9d79e11 Add lvol module to manage logical volumes. 2013-02-27 11:27:26 +01:00
Michael DeHaan
b1a4fab7e1 Merge pull request #2208 from tastychutney/devel 
Better documentation, removed runfcgi, added createcachetable
 2013-02-26 19:26:39 -08:00
Scott Anderson
36eeb7562a Better documentation, removed runfcgi, added createcachetable, merge with Michael's changes 2013-02-26 22:11:30 -05:00
Michael DeHaan
7dbfad8225 baby-JSON not supported, let selinux module warn using regular JSON 2013-02-26 21:57:47 -05:00
Michael DeHaan
d251e68ac5 Resolve merge 2013-02-26 20:57:36 -05:00
Michael DeHaan
1366c663eb Merge branch 'copy-diff-take2' of git://github.com/stoned/ansible into better_diff 
Conflicts:
	library/file
 2013-02-26 20:51:32 -05:00
Michael DeHaan
9e2cb42b4f Add some aliases for django manage, mainly around underscores, and use the newer (easier) way to do module docs. Also 
add list of avail commands to docs.
 2013-02-26 20:45:44 -05:00
Scott Anderson
06890085d2 Django manage.py administration module 2013-02-26 20:45:44 -05:00
Michael DeHaan
7090ad3aac Merge pull request #2195 from tbielawa/NOOP 
First try and making the nagios module NOOPpable
 2013-02-26 17:32:41 -08:00
Michael DeHaan
c485cb3700 Remove some tab/space issues in previous commits. 2013-02-26 20:30:33 -05:00
Michael DeHaan
6a487409db Merge branch 'postgresql-check-mode' of git://github.com/cocoy/ansible into devel 2013-02-26 20:28:04 -05:00
Michael DeHaan
0e1ba5e676 Prevent SVN checkouts from failing due self signed certs. 2013-02-26 20:23:12 -05:00
Michael DeHaan
9f083bfca3 Merge pull request #2207 from marktheunissen/mysql-pass-and-password 
Adding back support for pass=
 2013-02-26 16:12:09 -08:00
Mark Theunissen
234d31bf72 Adding back support for pass= 2013-02-26 16:27:23 -06:00
Daniel Hokka Zakrisson
93f02d614b Merge pull request #2187 from dhozac/argument-type-check 
Add type checking for module arguments, converting as much as possible
 2013-02-26 14:05:36 -08:00
Tim Bielawa
b0bd0a0f4a Making the nagios module NOOPpable 2013-02-26 12:28:01 -05:00
Stoned Elipot
10e9f1fc1e Implement --diff for the copy module. 2013-02-25 23:32:52 +01:00
Seth Vidal
f02ea15f0c command: make sure that all _handle_aliases() calls returns {} 
module_common: also work if there are no aliases (shell, command, etc) modules
 2013-02-25 17:07:47 -05:00
Seth Vidal
b54887b03c make sure ec2_secret_key is set to no_log=True 2013-02-25 16:34:06 -05:00
Michael DeHaan
3c40ce5700 Better detection of whether a service is managed by systemd or not. 2013-02-24 11:58:05 -05:00
Michael DeHaan
596c98320a Service module now knows a little more about systemd. This module is 
really due for some refactoring, but telling how a service is managed is
a little fuzzy anyway.  on a systemd system typoing the service will now
give you a rather systemd specific error which is somewhat suboptimal.
 2013-02-24 11:50:39 -05:00
Michael DeHaan
4be3b06842 Run chkconfig enable/disable only when needed. TODO, apply same logic to update-rc.d/systemd 2013-02-24 10:33:40 -05:00
Rodney Quillo
3bf088c084 Fix tabs/spaces. 2013-02-24 15:10:57 +08:00
Michael DeHaan
0380ba7177 If running is given as the state value instead of 'started', still return the correct end state. 2013-02-23 22:28:57 -05:00
Michael DeHaan
624a952c5c The service module made some assumptions about how a service should be managed based on what was installed on the system in terms of service 
management tools, which meant upstart services on CentOS6 were not startable.  This tweak allows things like vmware-tools to be controlled
via the service module.  More testing on other distributions (particularly with systemd) is presumably needed.
 2013-02-23 20:31:29 -05:00
Daniel Hokka Zakrisson
578ec127fb Remove choices=BOOLEANS as it is no longer needed 2013-02-23 22:57:36 +01:00
Michael DeHaan
582f088e7e Fix module docs formatting 2013-02-23 15:11:15 -05:00
Michael DeHaan
c86b34dae1 Lots of docsite additions for new features + cleanup lineinfile YAML docs 2013-02-23 15:08:33 -05:00
Daniel Hokka Zakrisson
df798d0688 Use argument type checking to convert to boolean 2013-02-23 19:59:52 +01:00
Michael DeHaan
b75b9681a8 more places to use yaml.safe_load 2013-02-23 13:34:14 -05:00
Michael DeHaan
69a199727c Merge pull request #2180 from jsmartin/cloudformation 
CloudFormation support.
 2013-02-23 09:57:09 -08:00
Michael DeHaan
878eb5a9b1 Merge pull request #2185 from lwade/devel 
Issue #2158 - add VPC subnet ID support
 2013-02-23 09:53:26 -08:00
Michael DeHaan
ac41a9d1f0 Merge pull request #2175 from tyll/devel 
mysql_db/user: Use password for my.cnf
 2013-02-23 09:52:14 -08:00
Michael DeHaan
8b3ebf0d10 mark when various new flags were added to the pip & easy_install modules 2013-02-23 12:51:23 -05:00
Michael DeHaan
9b32ab7ec2 Merge pull request #2150 from jhoekx/venv-command 
Venv command
 2013-02-23 09:50:10 -08:00
lwade
0486c7d51a missed a spot. 2013-02-23 17:46:35 +00:00
lwade
30ac2edc33 Adding VPC subnet ID support 2013-02-23 17:45:47 +00:00
Michael DeHaan
b739a5860a Merge branch 'lineinfile_improvements' of git://github.com/leucos/ansible into devel 
Conflicts:
	library/lineinfile
 2013-02-23 12:45:36 -05:00