Merge lp:~smoser/cloud-init/trunk.1532072 into lp:~cloud-init-dev/cloud-init/trunk
Proposed by
Scott Moser
Status: | Merged |
---|---|
Merged at revision: | 1245 |
Proposed branch: | lp:~smoser/cloud-init/trunk.1532072 |
Merge into: | lp:~cloud-init-dev/cloud-init/trunk |
Diff against target: |
71 lines (+29/-12) 3 files modified
ChangeLog (+1/-0) cloudinit/user_data.py (+16/-12) tests/unittests/test_data.py (+12/-0) |
To merge this branch: | bzr merge lp:~smoser/cloud-init/trunk.1532072 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
cloud-init Commiters | Pending | ||
Review via email: mp+298066@code.launchpad.net |
Commit message
user_data: fix error when user-data is not utf-8 decodable
when user-data was not decodable, cloud-init would raise exception.
This also changes the signature of user_data.
The 'headers' argument was never used, and woudl have been broken
if it was, as it was expected to be a dictionary but then was
passed in with *headers.
To post a comment you must log in.
Seems ok to me!