Michael DeHaan be947e5266 Resolve merge conflict

2013-04-22 23:57:20 -04:00

..

__init__.py

Resolve merge conflict

2013-04-22 23:57:20 -04:00

module_docs.py

more places to use yaml.safe_load

2013-02-23 13:34:14 -05:00

plugins.py

Added a 'set_up' and 'tear_down' which are like tasks, but execute before and after roles.

2013-04-20 16:07:06 -04:00

template.py

Smush the braces in various places (hey, that rhymes) to avoid undo key=value splitting surprises

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