Michael DeHaan faaa90ed03 Merge branch 'ocean' into devel ...

Conflicts:
	library/cloud/digital_ocean

2013-06-19 21:53:33 -04:00

..

cloud

Merge branch 'ocean' into devel

2013-06-19 21:53:33 -04:00

commands

Docs: consistently format playbook EXAMPLES

2013-06-17 08:53:46 +02:00

database

Docs: consistently format playbook EXAMPLES

2013-06-17 08:53:46 +02:00

files

Merge branch 'file_hard' of git://github.com/bcoca/ansible into devel

2013-06-18 20:31:05 -04:00

internal

Allow modules to be categorized, and also sort them when generating the documentation.

2013-04-28 15:03:45 -04:00

inventory

make name the parameter, with hostname as alias

2013-06-18 21:11:52 -07:00

messaging

Docs: consistently format playbook EXAMPLES

2013-06-17 08:53:46 +02:00

monitoring

Merge pull request #3264 from arturaz/devel

2013-06-19 08:27:13 -07:00

net_infrastructure

DOCS: standardize on EXAMPLES (a.k.a. Docs-JumboPatch JetLag Edition)

2013-06-15 20:54:25 +02:00

network

Removed merge conflict header

2013-06-18 15:01:01 -06:00

notification

Fixed a few small typos

2013-06-18 12:26:40 -06:00

packaging

Fix purging of packages

2013-06-19 21:37:37 -04:00

source_control

DOCS: standardize on EXAMPLES (a.k.a. Docs-JumboPatch JetLag Edition)

2013-06-15 20:54:25 +02:00

system

bug fix: modify get_device_facts to handle servers with multiple pci domains

2013-06-18 22:48:05 -04:00

utilities

Docs: consistently format playbook EXAMPLES

2013-06-17 08:53:46 +02:00

web_infrastructure

django_manage: Pass --noinput to migrate

2013-06-18 23:05:40 -04:00