Merge lp://staging/~darkmuggle-deactivatedaccount/cloud-init/lp1423972 into lp://staging/~cloud-init-dev/cloud-init/trunk

Proposed by Ben Howard
Status: Merged
Merged at revision: 1064
Proposed branch: lp://staging/~darkmuggle-deactivatedaccount/cloud-init/lp1423972
Merge into: lp://staging/~cloud-init-dev/cloud-init/trunk
Diff against target: 12 lines (+1/-1)
1 file modified
cloudinit/user_data.py (+1/-1)
To merge this branch: bzr merge lp://staging/~darkmuggle-deactivatedaccount/cloud-init/lp1423972
Reviewer Review Type Date Requested Status
Scott Moser Pending
Review via email: mp+250514@code.staging.launchpad.net

Description of the change

When converting the user-data to mime encoding, cloudinit/user_data.py is expecting a string. Some of the datasources return base64.b64decode(...). Starting with Python 3, base64.b64decode() started returning a byte string.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.