James Tanner c751168895 Fix merge conflicts

2014-03-31 13:15:21 -04:00

..

cloud

don't parse empty stream chunks

2014-03-30 15:27:29 -04:00

commands

Micro-optimization: replace s.find(x)!=-1 with x in s

2014-03-16 13:10:28 -04:00

database

Update comments about redis config.

2014-03-19 18:15:52 -04:00

files

Merge #5903 from rhaido/ansible

2014-03-31 12:53:03 -04:00

internal

Make async jid's unique per host

2014-03-26 13:48:47 -05:00

inventory

Make add_host clear the inventory pattern cache, add some more aliases. Fixes #4442.

2013-10-11 16:37:10 -04:00

messaging

Typo in rabbitmq_plugin docs

2014-02-28 11:38:11 -06:00

monitoring

Fix librato_annotation docstring

2014-03-30 22:28:31 -04:00

net_infrastructure

Adding an options sections to the docstring in the lldp module

2014-03-30 23:08:53 -05:00

network

Merge pull request #6649 from picsolvebryan/devel

2014-03-28 11:49:04 -04:00

notification

Merge pull request #6740 from mjschultz/add-sns-notification

2014-03-28 13:37:09 -04:00

packaging

Fix merge conflicts

2014-03-31 13:15:21 -04:00

source_control

Merge branch 'intellectronica/non-recursive-git' of git://github.com/intellectronica/ansible into devel

2014-03-28 17:49:02 -04:00

system

fix typo in the capabilities module description

2014-03-30 22:33:24 +02:00

utilities

Acclerate improvements

2014-03-23 14:45:49 -05:00

web_infrastructure

Add version_added info + changelog

2014-03-28 17:11:21 -04:00