Commit graph

6815 commits

Author SHA1 Message Date
James Cammarata
202c4f5294 Merge branch 'do_until_14' of https://github.com/bennojoy/ansible into bennojoy-do_until_14 2013-09-25 15:49:14 -05:00
James Cammarata
7eff2a8406 Merge branch 'ec2_inventory_route53' of https://github.com/herbyg-axial/ansible into herbyg-axial-ec2_inventory_route53 2013-09-25 15:45:51 -05:00
James Cammarata
9a66645342 Merge branch 'fix_setup' of https://github.com/tonk/ansible into tonk-fix_setup 2013-09-25 15:44:37 -05:00
James Cammarata
301a00ccf5 Merge branch 'obsd-fix-release' of https://github.com/johanwiren/ansible into johanwiren-obsd-fix-release 2013-09-25 14:49:57 -05:00
James Cammarata
478c400817 Minor pep8 cleanup in the new jail connection plugin 2013-09-25 14:48:30 -05:00
James Cammarata
0e0595bdb2 Merge branch 'jail' of https://github.com/mscherer/ansible into mscherer-jail 2013-09-25 14:47:24 -05:00
James Cammarata
b41ea366c8 Doc fix in htpasswd module due to colon on the line 2013-09-25 14:46:16 -05:00
James Cammarata
786a765063 Merge branch 'add-scheme-to-htpasswd-params' of https://github.com/PugglePay/ansible into PugglePay-add-scheme-to-htpasswd-params 2013-09-25 14:39:14 -05:00
James Cammarata
23417368df Fixing up some open_iscsi docs and CHANGELOG update 2013-09-25 14:37:56 -05:00
James Cammarata
c98ed252fe Merge branch 'open_iscsi_bis' of https://github.com/sergevanginderachter/ansible into sergevanginderachter-open_iscsi_bis 2013-09-25 14:35:01 -05:00
bennojoy
70a9a797fa Fix for accelerate when ansible_ssh_user is specified 2013-09-25 19:24:54 +05:30
Jasper Capel
d4dec5f577 Allow creating empty inventory
Instantiating the Inventory class with host_list=None now results in an
empty inventory instead of an error.
2013-09-25 15:00:35 +02:00
Andrey Shorin
fd101dd2d6 Encode to utf-8 only when needed 2013-09-25 09:29:57 +04:00
Andrey Shorin
21f5bc4242 Prevent UnicodeEncodeError: 'ascii' codec can't encode characters in position ...: ordinal not in range(128) 2013-09-25 09:29:56 +04:00
Benno Joy
16d0320408 Update playbooks2.rst 2013-09-25 10:48:43 +05:30
bennojoy
daf2f49116 doc update 2013-09-25 10:22:51 +05:30
bennojoy
0e749611ac doc update and add attempts 2013-09-25 09:56:14 +05:30
James Cammarata
776fc044dd Merge pull request #4231 from drfickle/svn_docs
Elaborate on capabilities of subversion module
2013-09-24 11:15:52 -07:00
Steve Fox
bd48251b34 Elaborate on capabilities of subversion module 2013-09-24 11:10:09 -05:00
James Cammarata
a2be93e4b8 Merge pull request #4229 from eggsby/supervisorctl
supervisorctl module: fixing typo in error handling
2013-09-24 08:48:15 -07:00
egghead
255d2d6770 supervisorctl module: fixing typo in error handling 2013-09-24 15:36:16 +00:00
Jake Kreider
bd446ef777 Include database param if provided and valid in django_admin commands 2013-09-24 10:05:45 -05:00
James Cammarata
a364308b43 Merge pull request #4225 from resmo/doc/hosts
host: minor doc style improvements
2013-09-24 07:21:32 -07:00
Tomasz Lesniewski
385ffcdfb1 Module lvol fails when decimal point is a colon 2013-09-24 16:19:07 +02:00
Rene Moser
ff84812047 host: minor doc style improvements 2013-09-24 15:47:39 +02:00
Tomasz Lesniewski
e2815a56dc Module lvol fails when decimal point is a colon 2013-09-24 15:06:18 +02:00
Michael DeHaan
314e1aafc1 Merge pull request #4220 from dagwieers/setup-dmidecode-fix
Fix for commented dmidecode output
2013-09-24 05:04:33 -07:00
Michael DeHaan
3bce12c529 Merge pull request #4218 from resmo/doc/host
host: added another example
2013-09-24 05:02:49 -07:00
Dag Wieers
5bd7664fac Fix for commented dmidecode output
This patch fixes the problem that on some system dmidecode prints out warning information as commented text. For example:

    [user@system ~]# dmidecode -s system-manufacturer
    # SMBIOS implementations newer than version 2.6 are not
    # fully supported by this version of dmidecode.
    HP

So we remove all commented lines from the output.
2013-09-24 12:46:48 +02:00
bennojoy
21529de82e dountil feature commit 2 2013-09-24 15:23:01 +05:30
bennojoy
53e48b63a9 dountil feature commit 1 2013-09-24 13:59:38 +05:30
Rene Moser
803b2b91a6 host: added another example 2013-09-24 09:15:16 +02:00
James Cammarata
93336ce00d Merge branch 'devel' of https://github.com/volker48/ansible into volker48-devel 2013-09-23 21:24:43 -05:00
Herby Gillot
8b3674bf58 minor spacing cleanup 2013-09-23 21:43:00 -04:00
Herby Gillot
6ddebb3fad ec2 inventory route53 tagging:
* make filtering more comprehensive
* add checks against missing route53 zone exclusion option
2013-09-23 21:40:18 -04:00
James Cammarata
a6d62ef59b Minor pep8 cleanup 2013-09-23 16:37:42 -05:00
James Cammarata
29bff3ffc1 Merge branch 'supervisorctl' of https://github.com/eggsby/ansible into eggsby-supervisorctl 2013-09-23 16:31:50 -05:00
James Cammarata
4420379f59 Fixing some bugs found during testing in the host module 2013-09-23 16:05:43 -05:00
James Cammarata
da0d50c383 Merge branch 'feature/host' of https://github.com/resmo/ansible into resmo-feature/host 2013-09-23 15:42:30 -05:00
James Cammarata
d647c5dc00 Added a delimiter example and a version_added string for assemble 2013-09-23 15:32:36 -05:00
James Cammarata
a97872906f Fixed a bug in the delimiter change for the assemble module 2013-09-23 15:29:13 -05:00
James Cammarata
bcf9a75d94 Merge branch 'devel' of https://github.com/pcgentry/ansible into pcgentry-devel 2013-09-23 15:18:15 -05:00
James Cammarata
a8fac7906d Merge branch 'devel' of https://github.com/drybjed/ansible into drybjed-devel 2013-09-23 15:10:40 -05:00
James Cammarata
c31ece58fa Added version_added string to new modprobe module and CHANGELOG update 2013-09-23 15:02:02 -05:00
James Cammarata
4d7b5da25d Merge branch 'modprobe-module' of https://github.com/stygstra/ansible into stygstra-modprobe-module 2013-09-23 15:00:50 -05:00
James Cammarata
30a1560d67 Merge branch 'devel' of https://github.com/tomdymond/ansible into tomdymond-devel 2013-09-23 14:53:46 -05:00
James Cammarata
080f35f63a Merge branch 'ec2_boto' of https://github.com/CharlesBlonde/ansible into CharlesBlonde-ec2_boto 2013-09-23 14:20:23 -05:00
James Cammarata
ca2950141b Merge branch 'bcoca-env_facts' into devel 2013-09-23 14:18:27 -05:00
James Cammarata
d1f713938e Modified env fact gathering to use the native python method
Also updated CHANGELOG for this feature
2013-09-23 14:17:40 -05:00
James Cammarata
19343288df Merge branch 'env_facts' of https://github.com/bcoca/ansible into bcoca-env_facts 2013-09-23 13:46:11 -05:00