diff options
| author | Nate House nathan.house@rackspace.com <> | 2014-02-03 16:03:14 -0600 |
|---|---|---|
| committer | Nate House nathan.house@rackspace.com <> | 2014-02-03 16:03:14 -0600 |
| commit | a9e4009ae7221ea167b3e1083a887564483e0350 (patch) | |
| tree | a370bd47399b1517c21b89d68aefd5afc15c5418 /cloudinit/user_data.py | |
| parent | 4a0e460f18d8cbf2651286565efec1f00cbb20cd (diff) | |
| parent | 3cfe9b3d8958b1a4e450d5ff31d805c424945027 (diff) | |
| download | vyos-cloud-init-a9e4009ae7221ea167b3e1083a887564483e0350.tar.gz vyos-cloud-init-a9e4009ae7221ea167b3e1083a887564483e0350.zip | |
Fix merge conflict
Diffstat (limited to 'cloudinit/user_data.py')
| -rw-r--r-- | cloudinit/user_data.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cloudinit/user_data.py b/cloudinit/user_data.py index 3032ef70..de6487d8 100644 --- a/cloudinit/user_data.py +++ b/cloudinit/user_data.py @@ -311,7 +311,8 @@ class UserDataProcessor(object): def _attach_part(self, outer_msg, part): """ Attach a message to an outer message. outermsg must be a MIMEMultipart. - Modifies a header in the outer message to keep track of number of attachments. + Modifies a header in the outer message to keep track of number of + attachments. """ part_count = self._multi_part_count(outer_msg) self._process_before_attach(part, part_count + 1) |