Scott Moser 7bb21a6384 merge from trunk

2013-03-07 16:27:47 -05:00

..

__init__.py

Continue working on merging code.

2013-03-06 19:24:05 -08:00

boot_hook.py

Start allowing different merging types to be applied

2012-11-20 20:02:48 -08:00

cloud_config.py

Continue working on merging code.

2013-03-06 19:24:05 -08:00

shell_script.py

Start allowing different merging types to be applied

2012-11-20 20:02:48 -08:00

upstart_job.py

merge from trunk

2013-03-07 16:27:47 -05:00