Commit graph

4184 commits

Author SHA1 Message Date
Michael DeHaan
12391a4ba9 Merge branch 'intellectronica/non-recursive-git' of git://github.com/intellectronica/ansible into devel
Conflicts:
	library/source_control/git
2014-03-28 17:49:02 -04:00
Michael DeHaan
3f6ddfb676 Add LLDP module 2014-03-28 17:41:58 -04:00
Andy Hill
fb82e1f942 lldp: Added EXAMPLES 2014-03-28 17:41:58 -04:00
Andy Hill
b31a92a30d lldp support in Ansible
This PR introduces support for a lldp module.

lldpd is similar to CDP and can return useful details about a server's network like ports, switches, and VLANs.
2014-03-28 17:41:58 -04:00
Michael DeHaan
1da0f24089 Documentation fixes + add missing license header 2014-03-28 17:20:20 -04:00
Seth Edwards
2463b21d91 add librato annotation module 2014-03-28 17:20:20 -04:00
Michael DeHaan
54180817cd Add version_added info + changelog 2014-03-28 17:11:21 -04:00
Christian Berendt
5b8cdf6ce2 use module.get_bin_path() for a2enmod 2014-03-28 17:10:15 -04:00
Christian Berendt
a500f63766 removed duplicated <<INCLUDE_ANSIBLE_MODULE_COMMON>> line 2014-03-28 17:10:15 -04:00
Christian Berendt
62813f72a5 added module to enable/disable Apache2 modules
This module uses a2enmod or a2dismod to enable or disable
Apache2 modules.
2014-03-28 17:10:15 -04:00
Michael DeHaan
c072e08cbc changelog and version bump 2014-03-28 17:04:31 -04:00
Michael DeHaan
eea9ef4404 Merge branch 'add_rollbar_rollbar_deployment_module' of git://github.com/kavu/ansible into devel 2014-03-28 17:03:59 -04:00
Michael DeHaan
a72d15fb7f Changelog and version updates. 2014-03-28 17:01:15 -04:00
Michael DeHaan
1657792a05 Merge branch 'layman' of git://github.com/jirutka/ansible into devel 2014-03-28 17:00:52 -04:00
Cristian Ciupitu
03eb65f25d Bugfix for gc_storage and s3
Make keysum return None if not key_check (this case wasn't covered).
2014-03-28 22:47:46 +02:00
Jonathan Mainguy
a5ac920a19 Did my best to rebase. Now includes the latest changes made to devel, along with my change of adding category option to module 2014-03-28 15:35:52 -04:00
Michael DeHaan
5fc8a6bbd9 Merge pull request #6081 from alexanderpopov1/ec2_vpc-subnet-tagging
Added support for tagging subnets in ec2_vpc module
2014-03-28 15:27:59 -04:00
Michael DeHaan
17785ea11e Documentation updates / changelog. 2014-03-28 15:03:04 -04:00
Michael DeHaan
2a776f0701 Merge branch 'added-logentries-module' of git://github.com/ivanvanderbyl/ansible into devel 2014-03-28 15:01:49 -04:00
Michael DeHaan
a8b345ad38 Repairs for documentation build. 2014-03-28 14:57:29 -04:00
Michael DeHaan
6fb2d56970 Resolve merge. 2014-03-28 14:56:59 -04:00
Michael DeHaan
f596ee8850 Slight docs tweak, split lines according to code standards 2014-03-28 14:04:59 -04:00
Andrea.Mandolo
2a66f356b1 correct documentation comment and version_added in "synchronize" module 2014-03-28 14:04:59 -04:00
Andrea.Mandolo
7cd21a47ef Add STDOUT lines in response of "synchronize" module 2014-03-28 14:04:59 -04:00
Andrea.Mandolo
33b440ac9f Add "checksum" option support to 'synchronize' module 2014-03-28 14:04:59 -04:00
Michael DeHaan
8d0b4e1147 Add version_added to docs. 2014-03-28 13:51:22 -04:00
Michael DeHaan
8ba2b7f8eb Merge branch 'aws-ec2-egress-rules' of git://github.com/mmoya/ansible into devel 2014-03-28 13:50:58 -04:00
Michael DeHaan
d2cef95001 Merge pull request #6740 from mjschultz/add-sns-notification
Add Amazon SNS notification plugin
2014-03-28 13:37:09 -04:00
Michael DeHaan
7ced8de690 Rename apt-rpm to apt_rpm. 2014-03-28 13:18:49 -04:00
Michael DeHaan
5599835a1d Merge branch 'apt-rpm' of git://github.com/evgkrsk/ansible into devel 2014-03-28 13:17:37 -04:00
Michael DeHaan
8964b2e049 Merge branch 'devel' of git://github.com/leafnode/ansible into devel
Conflicts:
	library/packaging/apt_key
2014-03-28 13:15:06 -04:00
Alex Coomans
3f5a72707b Allow setting env variables over .dnsimple file 2014-03-28 13:13:19 -04:00
Alex Coomans
dd12504d97 Add the dnsimple module 2014-03-28 13:13:19 -04:00
Michael DeHaan
f4bf078d6f Rename prerelease to pre_release. 2014-03-28 13:09:10 -04:00
Bob Zoller
b023f32cdf gem module supports prerelease (--pre) 2014-03-28 13:09:10 -04:00
Michael DeHaan
6c206b3866 Documentation updates for supervisor module changes. 2014-03-28 13:07:13 -04:00
Michael DeHaan
f24a625750 Merge branch 'supervisorctl-support-group' of git://github.com/inetfuture/ansible into devel 2014-03-28 13:04:21 -04:00
addshore
68f12aa995 Add --remote to git submodule_update
This simply adds --remote to the git submodule update command.
This means that if a branch is defined in .gitmodules then we should track said branch when updating.
2014-03-28 13:01:39 -04:00
Michael DeHaan
85320532d4 Rename vgoptions to vg_options. 2014-03-28 12:53:36 -04:00
Michael DeHaan
07423c1714 Merge branch 'devel' of git://github.com/chamill/ansible into devel
Conflicts:
	library/system/lvg
2014-03-28 12:53:00 -04:00
Michael DeHaan
be4e728a8e Merge branch 'ec2_vpc-multiple-vpcs-support' of git://github.com/alexanderpopov1/ansible into devel
Conflicts:
	library/cloud/ec2_vpc
2014-03-28 12:51:40 -04:00
Michael DeHaan
72696fec03 Merge branch 't-apt-list' of git://github.com/Elemecca/ansible into devel 2014-03-28 12:19:23 -04:00
Michael J. Schultz
9b9ac7aa96 Add some failure handling for region and publish 2014-03-28 11:08:50 -05:00
Michael DeHaan
289b359139 Merge pull request #6486 from discordianfish/docker-module-add-running
Rename present to running, add new present state
2014-03-28 11:50:21 -04:00
Michael DeHaan
f4b33e8b65 Merge pull request #6626 from brentley/devel
Allow custom hipchat urls
2014-03-28 11:49:37 -04:00
Michael DeHaan
eb1c37c6e1 Merge pull request #6649 from picsolvebryan/devel
Accept status code from a list of valid codes.
2014-03-28 11:49:04 -04:00
Michael DeHaan
ca6545cb66 Merge pull request #6671 from dermute/svr4pkg-G
svr4pkg supports the -G switch for pkgadd
2014-03-28 11:42:46 -04:00
Michael DeHaan
9fa0ec57fb Scrub choices=BOOLEANS from remaining core module references. Correct form in argument_spec is type='dict'. 2014-03-28 11:41:35 -04:00
Michael DeHaan
de5849c89a Merge branch 'ec2_snapshot' of git://github.com/hkariti/ansible into devel 2014-03-28 11:36:31 -04:00
Michael DeHaan
b27c21ca53 Merge pull request #6730 from sivel/rax-cbs-new
New modules: rax_cbs and rax_cbs_attachments
2014-03-28 11:28:46 -04:00