James Tanner 6694b28d51 Fix merge conflict

2013-11-06 18:38:01 -05:00

..

cloud

Merge pull request #4776 from jlaska/ec2_wait_on_terminate

2013-11-06 12:02:00 -08:00

commands

Allow for relative paths by using abspath

2013-08-20 22:48:42 -07:00

database

Changed parameter from 'user' to 'name' in the examples to coincide with the specs.

2013-11-02 22:42:44 -07:00

files

Fix merge conflict

2013-11-06 18:38:01 -05:00

internal

Ensure async terminates when time limit is not divisible by 5

2013-11-05 09:42:28 +10: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

Add missing version_added description in docs.

2013-07-20 12:08:47 -04:00

monitoring

Monit fix - Use case insensitive comparison

2013-10-03 02:46:35 +08:00

net_infrastructure

Merge pull request #4712 from mhite/bigip_node

2013-10-29 06:07:45 -07:00

network

Fix issue 4433, make sure status is a int rather than a string

2013-10-12 22:10:40 +02:00

notification

Remove examples of module antipattern of setting the choices array for boolean types.

2013-10-11 08:45:13 -04:00

packaging

Merge pull request #4786 from SalesSeek/find-correct-easy-install

2013-11-06 07:39:19 -08:00

source_control

Fix documentation formatting.

2013-10-31 20:00:11 -04:00

system

Address #4573 Check interface keys and return gracefully on solaris zones

2013-11-06 18:11:22 -05:00

utilities

Merge pull request #4772 from mscherer/fix_4763

2013-11-04 15:36:02 -08:00

web_infrastructure

Allow generic django_management commands

2013-10-18 17:26:10 -07:00