Merge lp:~lynxman/ubuntu/oneiric/puppet/lp_854899 into lp:ubuntu/oneiric/puppet
Proposed by
Marc Cluet
Status: | Rejected | ||||
---|---|---|---|---|---|
Rejected by: | Martin Pitt | ||||
Proposed branch: | lp:~lynxman/ubuntu/oneiric/puppet/lp_854899 | ||||
Merge into: | lp:ubuntu/oneiric/puppet | ||||
Diff against target: |
108 lines (+37/-18) 4 files modified
debian/changelog (+18/-0) debian/patches/debian-changes (+8/-18) debian/patches/fix_logcheck (+10/-0) debian/patches/series (+1/-0) |
||||
To merge this branch: | bzr merge lp:~lynxman/ubuntu/oneiric/puppet/lp_854899 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Marc Deslauriers | Disapprove | ||
Ubuntu branches | Pending | ||
Review via email: mp+76267@code.launchpad.net |
Description of the change
* Merge with upstream debian
To post a comment you must log in.
Unmerged revisions
- 54. By Marc Cluet
-
* Modified changelog to reflect Ubuntu diffs from debian upstream release
- 53. By Marc Cluet
-
* Modified changelog to reflect LP bug number (LP: #854899)
- 52. By Marc Cluet
-
* Merge with debian upstream (LP:#854899)
Whilst the FFe hasn't been accepted.. a quick look suggests the debian/changelog could use more detail, such as what Ubuntu changes remain - and if some were dropped, why?
Also the bug number in the format of LP: #854899
Do all the current ubuntu patches cleanly apply and unapply?