← Back to branch summary

~harlowja/cloud-init/ug-cleanup-part-deuce

~harlowja/cloud-init/ug-cleanup-part-deuce

Viewing all changes in revision 675.

Committer: Joshua Harlow
Date: 2012-09-28 21:21:02 UTC
mfrom: (671.1.4 trunk)
Revision ID: harlowja@yahoo-inc.com-20120928212102-257ix5hu0606cl1x

Sync with head and fix conflicts.

files added:
cloudinit/safeyaml.py

files modified:
cloudinit/distros/__init__.py

cloudinit/sources/DataSourceMAAS.py

cloudinit/util.py

packages/brpm

packages/redhat/cloud-init.spec.in

tests/unittests/test_util.py

Show diffs side-by-side

added added

removed removed

cloudinit/distros/__init__.py

cloudinit/safeyaml.py

cloudinit/sources/DataSourceMAAS.py

cloudinit/util.py

packages/redhat/cloud-init.spec.in

tests/unittests/test_util.py

Older »