cloud-init

Merge lp:~avishai-ish-shalom/cloud-init/1065116 into lp:~cloud-init-dev/cloud-init/trunk

  1. 1065116
  2. Merge into trunk
Proposed by Scott Moser
Status: Merged
Merged at revision: 693
Proposed branch: lp:~avishai-ish-shalom/cloud-init/1065116
Merge into: lp:~cloud-init-dev/cloud-init/trunk
Diff against target: 11 lines (+1/-1)
1 file modified
cloudinit/user_data.py (+1/-1)
To merge this branch: bzr merge lp:~avishai-ish-shalom/cloud-init/1065116
Reviewer Review Type Date Requested Status
cloud-init Commiters Pending
Review via email: mp+129412@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Joshua Harlow (harlowja) wrote :

Seems fine, anyway there can be a simple test added to make sure this doesn't happen again?

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'cloudinit/user_data.py'
2--- cloudinit/user_data.py 2012-09-01 01:12:30 +0000
3+++ cloudinit/user_data.py 2012-10-12 12:42:56 +0000
4@@ -224,7 +224,7 @@
5 for header in list(ent.keys()):
6 if header in ('content', 'filename', 'type', 'launch-index'):
7 continue
8- msg.add_header(header, ent['header'])
9+ msg.add_header(header, ent[header])
10
11 self._attach_part(append_msg, msg)
12