Merge lp:~harlowja/cloud-init/fix-resets into lp:~cloud-init-dev/cloud-init/trunk
Proposed by
Joshua Harlow
Status: | Merged |
---|---|
Merged at revision: | 703 |
Proposed branch: | lp:~harlowja/cloud-init/fix-resets |
Merge into: | lp:~cloud-init-dev/cloud-init/trunk |
Diff against target: |
310 lines (+169/-63) 6 files modified
cloudinit/stages.py (+28/-3) tests/data/user_data.1.txt (+15/-0) tests/unittests/test_merging.py (+62/-0) tests/unittests/test_runs/test_merge_run.py (+52/-0) tests/unittests/test_util.py (+0/-59) tools/run-pep8 (+12/-1) |
To merge this branch: | bzr merge lp:~harlowja/cloud-init/fix-resets |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Scott Moser | Approve | ||
Review via email: mp+133603@code.launchpad.net |
Description of the change
Tried test on non-patched branch. It fails. On new fixed 'reset' branch it works.
To post a comment you must log in.
Thanks!
please go ahead and push to turnk