Merge lp:~ubuntu-branches/ubuntu/natty/cloud-init/natty-201101272214 into lp:ubuntu/natty/cloud-init
Proposed by
James Westby
Status: | Merged |
---|---|
Merged at revision: | 68 |
Proposed branch: | lp:~ubuntu-branches/ubuntu/natty/cloud-init/natty-201101272214 |
Merge into: | lp:ubuntu/natty/cloud-init |
Diff against target: |
119 lines (+78/-0) (has conflicts) 7 files modified
.bzrignore (+1/-0) debian/README.source (+11/-0) debian/cloud-init.config (+8/-0) debian/cloud-init.templates (+12/-0) debian/patches/332-fix-perms-on-cloud-init-log.patch (+20/-0) debian/patches/336-rename-process-user-data-file.txt.patch (+24/-0) debian/patches/series (+2/-0) Conflict adding file debian/README.source. Moved existing file to debian/README.source.moved. Conflict adding file debian/cloud-init.config. Moved existing file to debian/cloud-init.config.moved. Conflict adding file debian/cloud-init.templates. Moved existing file to debian/cloud-init.templates.moved. Conflict adding file debian/patches/332-fix-perms-on-cloud-init-log.patch. Moved existing file to debian/patches/332-fix-perms-on-cloud-init-log.patch.moved. Conflict adding file debian/patches/336-rename-process-user-data-file.txt.patch. Moved existing file to debian/patches/336-rename-process-user-data-file.txt.patch.moved. Conflict adding file debian/patches/series. Moved existing file to debian/patches/series.moved. |
To merge this branch: | bzr merge lp:~ubuntu-branches/ubuntu/natty/cloud-init/natty-201101272214 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Ubuntu branches | Pending | ||
Review via email: mp+47743@code.launchpad.net |
Description of the change
The package history in the archive and the history in the bzr branch differ. As the archive is authoritative the history of lp:ubuntu/natty/cloud-init now reflects that and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/natty/cloud-init/natty-201101272214. A merge should be performed if necessary.
To post a comment you must log in.