Ingo Gottwald
f7adbf2f29
Bugfix service module: Only change service state when needed
2013-09-13 22:04:37 +02:00
Lorin Hochstein
264d83731a
AWS elastic IP: Support for allocating IPs
...
This commit adds support for allocating new elastic IPs with the
ec2_eip module.
2013-09-12 21:11:24 -04:00
Charles Blonde
00ec91bb36
Update instance_profile_name message
2013-09-12 22:14:27 +02:00
Thomas Jost
dfb10e646e
Add Archlinux "distribution" fact
2013-09-12 11:55:08 +02:00
James Cammarata
0d408ff295
Use low-level package objects in the apt module to check installed state
...
Packages which are half-installed are not adequately represented by
the .is_installed field of the apt.package.Package object. By using the
lower-level apt_pkg.Package object (which provides the .current_state
field), we can check for a partially-installed state more accurately.
Fixes #3421
2013-09-11 23:33:59 -05:00
James Cammarata
d2bf244eb8
Merge branch 'fix_changed_for_yum_group' of https://github.com/hnakamur/ansible into hnakamur-fix_changed_for_yum_group
2013-09-11 16:47:58 -05:00
James Cammarata
72eaa0570e
Allow service module to manage services not ending in .service
...
Fixes #3417
2013-09-11 15:48:36 -05:00
James Cammarata
5110b2d440
Slight refactorization of the sysctl module
...
* Added in support for freebsd-style sysctl commands
* Replaced some functionality that was provided by module_common
* Simplified some logic in a couple of places (ie, not checking
a split with len() but instead limiting the split to 1)
Fixes #3380
2013-09-11 13:15:17 -05:00
James Cammarata
3e9b63febd
Compare exploded values in the sysctl module to avoid whitespace errors
...
Fixes #3931
2013-09-10 23:24:24 -05:00
James Cammarata
b2741f451e
Fixes to the service module for Ubuntu 12.04 (LTS)
...
Fixes #3615
Fixes #3572
2013-09-10 22:19:15 -05:00
James Cammarata
9a3a3e648b
Check for systemd ownership of a service even if an init.d script exists
...
Also slight modification to the error message in the earlier commit that
modified the update-rc.d detection portion of the code
Fixes #3474
2013-09-10 19:37:51 -05:00
Hiroaki Nakamura
4d2c2a262a
Add an example for installing a group with the yum module.
2013-09-11 02:14:16 +09:00
Hiroaki Nakamura
caa68746ae
Fix to getchanged correctly for yum groupinstall.
2013-09-11 02:10:53 +09:00
James Cammarata
7c8aa669cf
Minor fix to account for template service names in systemctl
2013-09-10 11:31:13 -05:00
James Cammarata
6c3af4df81
Fix for update-rc.d based systems that also have systemd installed
...
By default, the service module had assumed that if the system had the
update-rc.d binary, the service was either managed via upstart or standard
sysV init-style scripts. This patch adds a check for systemctl ahead
of the other methods when update-rc.d is detected, and also simplifies
the logic around the detection of systemctl-managed services
2013-09-10 11:15:30 -05:00
Yap Sok Ann
498c2665de
Locate easy_install path after (optionally) creating virtualenv.
...
Without this, the first call to the easy_install module with a new virtualenv
will only create the virtualenv without installing the intended package, since
the `_is_package_installed` check will succeed as running /usr/bin/easy_install
as non-root user will return permission denied error with empty stdout.
2013-09-10 11:22:06 +08:00
James Cammarata
808d9596b2
Fixing typos in is_keyid function definition and usage
...
Fixes #4068
2013-09-09 17:26:44 -05:00
Charles Blonde
ac4e16a99b
Add support to Boto library < 2.5.0
2013-09-09 23:48:35 +02:00
James Cammarata
b3c0e3e45e
Revert "Styling: deprecation"
...
This reverts commit ecc2b6e742
.
Fixes #4069
2013-09-09 15:17:43 -05:00
James Cammarata
af139cd56a
Merge branch 'file_fixes' of https://github.com/bcoca/ansible into bcoca-file_fixes
2013-09-09 10:29:11 -05:00
Adam Miller
4220c3cc30
added try/catch around .connected call
2013-09-09 10:03:59 -05:00
Charles Blonde
02171711fa
Fix wait_for default value to follow the documentation (documentation = 180, default value = 120)
2013-09-08 23:52:40 +02:00
Charles Blonde
9a993992be
Fix wait_for conversion between String to int
2013-09-08 23:49:33 +02:00
James Laska
546788a1b6
The required package for selinux is libselinux-python
2013-09-06 16:26:48 -04:00
James Cammarata
7752a56091
Merge branch 'devel' of https://github.com/abompard/ansible into abompard-devel
2013-09-06 13:51:45 -05:00
James Cammarata
71bf9495ef
Merge branch 'fix_postgresql_db' of https://github.com/yteraoka/ansible into yteraoka-fix_postgresql_db
2013-09-06 13:26:01 -05:00
James Cammarata
b65cefe893
Cleaning up pep8 whitepsace issues in the mysql_replication module
2013-09-06 12:50:50 -05:00
James Cammarata
03e124d91f
Merge branch 'bugfix' of https://github.com/jsmartin/ansible into jsmartin-bugfix
2013-09-06 12:47:27 -05:00
James Martin
8c1ed028d3
Fixes for python 2.4 support, better collection of riak version.
2013-09-06 13:42:27 -04:00
James Cammarata
3adb91a4b4
Added version_added to the mysql_variables module doc section
2013-09-06 12:32:08 -05:00
James Cammarata
a57ced4b66
Merge branch 'mysql_variables' of https://github.com/banyek/ansible into banyek-mysql_variables
2013-09-06 12:25:52 -05:00
James Cammarata
a56c695bc8
Added version_added to the mysql_replication module doc section
2013-09-06 12:23:41 -05:00
James Cammarata
ff19cdae39
Merge branch 'mysql_replication' of https://github.com/banyek/ansible into banyek-mysql_replication
2013-09-06 12:10:31 -05:00
James Cammarata
441062f061
Cleaning up whitspace issues in the mysql_user module
2013-09-06 10:51:53 -05:00
John Hamelink
892c594319
Fixed #3767 - mysql_user command fails with dots (and underscores) in
...
database names.
2013-09-06 10:51:53 -05:00
Brian Coca
c2d1607490
Added collection of user's env
...
Signed-off-by: Brian Coca <briancoca+dev@gmail.com>
2013-09-06 08:55:37 -04:00
James Cammarata
aa0a31c0fc
Merge pull request #3966 from sergevanginderachter/uribug
...
Fix bug in uri where redirect check fails.
2013-09-05 22:03:42 -07:00
James Cammarata
82e1722fff
Merge branch 'aix_wpar_facts' of https://github.com/mplonka/ansible into mplonka-aix_wpar_facts
2013-09-05 23:49:29 -05:00
James Cammarata
84c977258f
Merge branch 'rdsfixes' of https://github.com/jamespharaoh/ansible into jamespharaoh-rdsfixes
2013-09-05 23:47:32 -05:00
James Cammarata
4a30bac78b
Corrected example for lineinfile due to ': ' on line
...
Closes #3992
2013-09-05 20:37:54 -05:00
Aurélien Bompard
5a949dcafc
Module postgresql_privs: fix default arguments
...
Defaults arguments must not be added to the connection keywords, as
the other postgresql modules already do.
Closes #4043
2013-09-06 00:17:49 +02:00
James Cammarata
20b0dc4abd
Check for an empty executable passed into the accelerate plugin
...
This was breaking at least the script module, so it would seem best
to check for it and set it to the default executable value
2013-09-05 15:11:26 -05:00
James Cammarata
f04af9118e
When putting a file in accelerated mode, make sure it's chowned correctly
2013-09-05 12:04:08 -05:00
Tom Dymond
11c2378259
Add option to specify the MySQL server port
2013-09-05 16:25:34 +01:00
Jell
a47f2674a4
Add crypt scheme to htpasswd params
2013-09-05 12:05:01 +02:00
TERAOKA Yoshinori
43464b6243
fix get_db_info
...
using pg_roles instead of pg_user
if database owner is a role (not user) then it can not select form pg_user table.
2013-09-05 12:40:16 +09:00
James Cammarata
d27372ff08
Modified ec2_elb doc per issue #3849
2013-09-03 16:13:25 -05:00
James Cammarata
4eedfa46a2
Merge branch 'devel' of https://github.com/mhite/ansible into mhite-devel
2013-09-03 15:05:13 -05:00
James Cammarata
8a016bb374
Adding the facility to the accelerate daemon syslog calls
2013-09-03 11:30:29 -05:00
James Cammarata
26a8d4ce9f
Added 'reloaded' state to list of states checked for bounced services
...
Fixes #3556
2013-09-03 09:49:19 -05:00
Serge van Ginderachter
a351c25c59
Introduce open-iscsi module to manage targets on the initiator.
2013-09-03 13:31:28 +02:00
James Cammarata
d05c61d1f0
Merge branch 'devel' into fireball2
...
Conflicts:
lib/ansible/playbook/__init__.py
lib/ansible/playbook/play.py
2013-09-02 21:54:02 -05:00
Marcus McCurdy
46ff02bc57
Makes pervious lineinfile fix more explicit
2013-09-02 16:16:45 -04:00
James Pharaoh
137a32ca36
make rds handle vpc security groups properly
2013-09-02 20:40:41 +02:00
James Pharaoh
dc5ffb688c
fix for rds region variable
2013-09-02 20:40:32 +02:00
Marcus McCurdy
64fa95ca11
Improves lineinfile's error checking
...
Line in file would raise a TypeError exception if
the 'line' key was in params, but its value was None.
2013-09-02 11:14:40 -04:00
James Cammarata
d69d5c294f
Renaming fireball2 as 'accelerate' and removing old references
2013-08-30 13:26:27 -05:00
Serge van Ginderachter
a311ee35b3
Fix bug in uri where redirect check fails.
...
When the redirect check fails, the 'status' key is not set in
resp_redir, so we need to check this.
2013-08-29 15:58:01 +02:00
Michael DeHaan
39fe40bb60
Merge pull request #3953 from melodous/issue-3908
...
Fix issue 3908. There was some ilegal operations over the sets
2013-08-28 14:01:38 -07:00
Michael DeHaan
1772b1b203
Merge pull request #3963 from djoreilly/quantum-net-doc
...
quantum_network: fix some doc mistakes
2013-08-28 13:53:03 -07:00
Darragh O'Reilly
993413e706
quantum_network: fix some doc mistakes
...
- tenant_name was missing.
- comments were on wrong tasks.
- error message had a reference to glance.
2013-08-28 21:19:24 +01:00
James Cammarata
af1dd7075f
Adding chunked file transfers to fireball2
2013-08-28 11:14:58 -05:00
James Cammarata
959138d00d
Added accelerate_port to plays, and made it configurable
2013-08-28 11:14:58 -05:00
James Cammarata
b45342923c
Initial support for sudoable commands over fireball2
...
Caveats:
* requiretty must be disabled in the sudoers config
* asking for a password doesn't work yet, so any sudoers users must
be configured with NOPASSWD
* if not starting the daemon as root, the user running the daemon
must have sudoers entries to allow them to run the command as the
target sudo_user
2013-08-28 11:14:58 -05:00
James Cammarata
4b552457e7
Bail out correctly if socket.recv gets nothing (indicating a closed socket)
2013-08-28 11:14:58 -05:00
James Cammarata
521e14a3ad
Fireball2 mode working!
2013-08-28 11:14:58 -05:00
Bruce Pennypacker
cf6a76c814
changed ignore_md5_mismatch to validate_md5
2013-08-28 14:41:00 +00:00
Bruce Pennypacker
41c474d129
added optional ignore_md5_mismatch parameter
2013-08-28 14:16:57 +00:00
Jharrod LaFon
be57d7cc99
The cloudformation module argument spec should match the documentation, so that template_parameters is a required argument.
2013-08-27 15:09:30 -06:00
Raul Melo
461858e476
Fix issue 3908. There was some ilegal operations over the sets
2013-08-27 17:07:42 +02:00
Michael DeHaan
8ec806905d
Merge pull request #3942 from jocelynj/gem
...
Correctly handle option user_install in gem module
2013-08-27 06:00:06 -07:00
Michael DeHaan
4ca5db0a57
Merge pull request #3861 from djoreilly/quantum_net_types
...
quantum_network should not default network provider type to local
2013-08-27 05:57:21 -07:00
James Cammarata
a8984a6b2b
Minor text corrections in the yum module documentation
2013-08-24 21:46:41 -05:00
James Cammarata
7625f40f99
Merge pull request #3941 from hnakamur/update_yum_doc_for_name_accepts_url_and_path
...
Add description and examples for the name parameter accepts a url or a l...
2013-08-24 19:43:33 -07:00
James Cammarata
ceddc37f07
Fix for the cron module on FreeBSD
...
Apparently crontab on freebsd does not like the file path coming before
the "-u username" portion of the command to install the crontab
2013-08-24 21:37:10 -05:00
Jocelyn Jaubert
f958a5ac81
Correctly handle option user_install in gem module
2013-08-24 22:49:18 +02:00
Hiroaki Nakamura
aa9e05baa2
Add description and examples for the name parameter accepts a url or a local path to a rpm file.
2013-08-25 02:30:41 +09:00
Marcin Płonka
61298e4703
Skipping facts not available on AIX WPARs
2013-08-24 07:24:05 +02:00
James Cammarata
2f6dcfe36f
Fixed small typo from the merge conflict in the route53 module
2013-08-23 13:40:57 -05:00
James Cammarata
7d69d1e289
Merge branch 'rb2' of https://github.com/bpennypacker/ansible into bpennypacker-rb2
2013-08-23 13:07:48 -05:00
Bruce Pennypacker
80ddb1aee6
Added wait parameter
2013-08-23 13:56:59 -04:00
James Cammarata
bb75050912
Merge branch 'rb2' of https://github.com/bpennypacker/ansible into bpennypacker-rb2
...
Conflicts:
library/cloud/route53
2013-08-23 11:36:45 -05:00
James Cammarata
1d98e7bc05
Cleaning up some pep8 issues in the pkgutil module
2013-08-22 20:21:02 -05:00
James Cammarata
dfbe1132d2
Merge branch 'allow_wildcard_yum' of https://github.com/mscherer/ansible into mscherer-allow_wildcard_yum
2013-08-22 16:20:10 -05:00
James Cammarata
7bd8c18fa7
Merge branch 'gitfix' of https://github.com/johanwiren/ansible into johanwiren-gitfix
2013-08-22 15:30:58 -05:00
Johan Wirén
dcd556b92f
Fixed so that we no longer check with the remote if a checkout already is at the desired sha version.
2013-08-22 22:05:37 +02:00
James Cammarata
12f2caeed6
Merge branch 'pacman_local_plus_check' of https://github.com/mivok/ansible into mivok-pacman_support_check_mode
2013-08-22 14:45:54 -05:00
James Cammarata
de4ed11fa6
Merge branch 'pacman_support_check_mode' of https://github.com/mivok/ansible into mivok-pacman_support_check_mode
2013-08-22 14:29:56 -05:00
Arthur Taylor
1dd3ff3879
Added Overwrite option for Route53 record creation
2013-08-22 12:46:20 -05:00
James Cammarata
abac720255
Merge branch 'command-relpath' of https://github.com/j2sol/ansible into j2sol-command-relpath
2013-08-22 11:16:51 -05:00
Joshua Lund
654b37f212
Fixing typo in EC2 modules
2013-08-21 18:13:05 -06:00
Jesse Keating
36ca709849
Allow for relative paths by using abspath
...
relative pathing comes in handy on occasion, particularly when
delegating to localhost and running some command out of your playbook
repo. Making use of os.path.abspath will allow for the full path to
chdir and executable to be discovered if not provided.
2013-08-20 22:48:42 -07:00
James Cammarata
ae98a025bb
Minor doc fixes for the pkgutil module
2013-08-20 21:08:56 -05:00
Alexander Winkler
59c7ef2afa
Added module pkgutil
2013-08-20 21:08:56 -05:00
Bruce Pennypacker
2e20387671
yet another rebase attempt
2013-08-20 15:15:58 -04:00
Bruce Pennypacker
0f458210bc
Rebase attempt
...
No idea if I'm rebasing properly or not. This is my first attempt.
2013-08-20 15:14:16 -04:00
Stephen Fromm
cc58403e48
Apply consistent parameter alises to hg and subversion
...
For issue #3372 , apply consistent parameter aliases to source_control
modules. For hg, add name and version and add to documentation string.
For subversion, add version and document version and name aliases in
documentation string.
2013-08-20 13:43:26 -05:00
James Cammarata
49b0ff18a7
Missed some typos in macros for the xattr doc
2013-08-20 00:50:56 -05:00
James Cammarata
230077fda9
Fixing docs in xattr module
2013-08-20 00:47:07 -05:00
James Cammarata
0747d41e76
Cleaning up some typos in the xattr module
2013-08-19 16:08:32 -05:00
James Cammarata
5e4f9657ca
Merge branch 'xattr2' of https://github.com/bcoca/ansible into bcoca-xattr2
2013-08-19 15:42:51 -05:00
Michael DeHaan
1509e995df
Merge pull request #3874 from mscherer/relax_nova_compute_argument
...
image_id is not required to delete a vm from openstack
2013-08-19 12:16:04 -07:00
James Cammarata
a39aa57c5c
Fixing small typo in redis module documentation
2013-08-19 14:04:58 -05:00
James Cammarata
17aa738872
Merge branch 'redis-config' of https://github.com/slok/ansible into slok-redis-config
2013-08-19 13:35:31 -05:00
James Cammarata
77b98df63b
Minor fix, vpc_id is not required for the ec2_group
2013-08-19 11:38:06 -05:00
Andrew de Quincey
58e85855e4
Add module to control EC2 security groups
2013-08-19 11:38:06 -05:00
sjahl
4dd68c07a0
setting 0644 permissions on mkstemp file handles. Fixes issue #3857
2013-08-18 11:03:43 -04:00
Mark Harrison
a347bfa2bb
Merge branch 'pacman_local' into pacman_local_plus_check
...
Conflicts:
library/packaging/pacman
2013-08-17 17:56:33 -04:00
Mark Harrison
0419fb74bb
Support check mode with pacman module
2013-08-17 17:44:41 -04:00
Mark Harrison
f52a1c8f46
Allow installation of local packages with pacman
2013-08-17 14:46:16 -04:00
Michael Scherer
472654447c
Allow to use '*test*' in enablerepo for yum action
...
Yum commandline permit to use a wildcard to enable and disable
repositories in the --enablerepo switch, permitting to enable
a complete set of repository at once ( like all rpmfusion, all
update-testing, etc ).
However, this doesn't work in yum due to more stringent checks
that verify that a exact match is given for the name of the
repository , see commit 5c26805.
This commit enhance the check by permitting to test more than
1 repository at a time, thus permitting to use wildcards.
2013-08-17 18:43:53 +02:00
Michael Scherer
3f158a4688
image_id is not required to delete a vm from openstack
...
Since deletion do not check the type of image or anything,
and since that's tedious to keep track of the image_id and
just adding noise to add image_id for nothing, this commit
just relax the requirement.
2013-08-17 17:56:19 +02:00
Adam Miller
50adda5096
added version checking, doesn't work in older versions
2013-08-16 17:29:57 -05:00
Michael DeHaan
dacd311474
Removing synchronize momentarily as it looks like this won't make 1.3 dates
2013-08-16 15:22:39 -04:00
Brian Coca
49d7f22db8
now correctly detects hard links
...
simplified check_mode
simplified other file attribute handling in link mode
made conditionals clearer
Signed-off-by: Brian Coca <briancoca+dev@gmail.com>
2013-08-15 23:39:02 -04:00
Brian Coca
52dd1dd4c5
now missing dep gives nicer error and docs disambiguate as several libs
...
out there have same name.
Signed-off-by: Brian Coca <briancoca+dev@gmail.com>
2013-08-15 21:26:35 -04:00
Darragh O'Reilly
fb42efc355
quantum_network should not default network provider type to local
...
It should allow the Quantum service to decide based on its configuration.
2013-08-15 19:51:22 +01:00
Matt Hite
e2278fd9e8
Automatically prepend partition if non-fully qualified monitors are passed
2013-08-13 22:00:49 -07:00
Matt Hite
b26a88095f
Documentation fixes and enhancements
2013-08-13 20:59:49 -07:00
James Cammarata
10a0f03cdc
Cleaning up of apt_repository module and removing wget parts
2013-08-13 16:11:03 -05:00
Adam Miller
7ad8f6b176
added firewalld module
...
update with feedback from pull request
2013-08-13 15:38:56 -05:00
Michael Vogt
de404eac06
use either pycurl or wget to download from launchpad, also improve error message if neither is installed
2013-08-13 14:39:47 -05:00
Michael Vogt
5e56d42ed1
use pycurl instead of urllib2 when talking to launchpad to actually get SSL cert verification, see https://bugs.launchpad.net/ubuntu/+source/software-properties/+bug/915210 or CVE-2011-4407 for a previous similar issue in software-properties
2013-08-13 14:39:47 -05:00
James Cammarata
c4852f6954
Cleaning up some pep8 whitespace issues in mongodb_user
2013-08-13 13:00:37 -05:00
lwade
eaac295fb2
Basic module to tag resources in EC2.
2013-08-13 12:55:06 -05:00
James Cammarata
0958673574
Reverting version_added field in the apt_repository module
2013-08-13 09:53:49 -05:00
Alexander Saltanov
ded947008a
Replacement for apt_repository.
...
1. Debian Squeeze is supported out of box now.
2. Repository type "deb" or "deb-src" should be explicitly specified.
3. If a source had beed added it must be possible to remove it.
4. PPA can be only used against Ubuntu hosts.
2013-08-13 09:53:49 -05:00
asmajlovic
8f45b77d30
Comparison data type mismatch corrected
2013-08-13 09:28:53 -05:00
James Cammarata
0c98c764e3
Fixing up a small issue with the mongodb_user docs
2013-08-13 09:05:19 -05:00
Ben Podoll
94e60563b4
adding fixes to support older versions of mongo (and pymongo) as well as new versions
2013-08-13 00:23:58 -05:00
Ben Podoll
bcef62cd39
adding comment about required version of mongodb to use the roles param
2013-08-12 21:25:21 -05:00
Ben Podoll
d330228d11
adding the ability to specify roles when adding/modifying a mongo user
2013-08-12 15:03:31 -05:00
Ben Podoll
3e32654f9d
fixing problem causing docs not to build
2013-08-12 12:17:34 -05:00
Ben Podoll
13bef3579f
adding a little more info to the 'path' param so it's clear there are aliases (which are used in other examples) to avoid confusion
2013-08-12 11:45:32 -05:00
James Cammarata
6feb4e3837
Fail apt package install when nothing is matched by the fnmatch pattern
...
Related to PR #3823
2013-08-12 11:26:31 -05:00
Michael Vogt
5c39c659e5
add support for fnmatch() style apt filenames
...
You can write a apt action like "- apt: pkg=apt*" with this package.
2013-08-12 16:11:15 +02:00
Mark Mandel
6e3ec9ccc0
expand user home path in stat.
2013-08-12 17:34:54 +10:00
Michael DeHaan
9b09ff4a65
Merge pull request #3821 from danxshap/django_venv_expand_user
...
Use home path expansion for virtualenv param in django_manage module
2013-08-11 17:53:01 -07:00
danxshap
4db4607ee5
use home path expansion for virtualenv param in django_manage module
2013-08-11 14:02:13 -07:00
Michael DeHaan
4e5feb6322
Merge pull request #3763 from j2sol/rax-updates
...
Update rax to sync with rax_clb_nodes
2013-08-11 13:37:25 -07:00
Michael DeHaan
bc02e20503
Merge branch 'rsynctake2' into devel
...
Conflicts:
CHANGELOG.md
2013-08-11 16:22:36 -04:00
Michael DeHaan
cde87f2f55
Add missing version_added to docs.
2013-08-11 16:21:00 -04:00
Michael DeHaan
70c42eeb64
Merge pull request #3784 from drewblas/devel
...
Added git disclaimer about dealing with ssh host checking
2013-08-11 12:50:48 -07:00
Michael DeHaan
1336bbd2f2
Merge pull request #3815 from amenonsen/typos
...
Fix some typos discovered during casual reading
2013-08-11 08:45:00 -07:00
Abhijit Menon-Sen
1a90d01ba9
Fix some typos discovered during casual reading
2013-08-11 18:41:23 +05:30
Dan Robinson
bda2ce6ffd
Brings postgresql_db examples in line with documentation.
...
As of now, the documentation lists a parameter as "name",
whereas the examples use a parameter called "db". This brings
them in line.
2013-08-11 00:41:23 -07:00
Michael DeHaan
f8c97d6e79
Style/docs cleanup, and also improve an error message.
2013-08-10 18:58:45 -04:00
Michael DeHaan
aeb8649da5
Merge branch 'ansible-rsync-take2' of git://github.com/tima/ansible into rsynctake2
2013-08-10 18:31:45 -04:00
Michael DeHaan
5e049a5df7
Merge branch 'fix_service_with_initscript' of git://github.com/psvo/ansible into devel
2013-08-10 18:05:35 -04:00
Michael DeHaan
146bbfecc5
Smite tabs in whitespace.
2013-08-10 17:58:03 -04:00