Merge lp://qastaging/~roadmr/ubuntu/precise/checkbox/0.13 into lp://qastaging/ubuntu/precise/checkbox
Proposed by
Daniel Manrique
| Status: | Merged |
|---|---|
| Merge reported by: | Sebastien Bacher |
| Merged at revision: | not available |
| Proposed branch: | lp://qastaging/~roadmr/ubuntu/precise/checkbox/0.13 |
| Merge into: | lp://qastaging/ubuntu/precise/checkbox |
| Diff against target: |
6686 lines (+6621/-0) (has conflicts) 11 files modified
checkbox/dispatcher.py (+201/-0) checkbox/parsers/cputable (+40/-0) checkbox/parsers/cputable.py (+42/-0) checkbox/parsers/deferred.py (+27/-0) checkbox/parsers/dmidecode.py (+123/-0) checkbox/parsers/meminfo.py (+46/-0) checkbox/parsers/udevadm.py.OTHER (+466/-0) debian/po/ro.po (+118/-0) po/ca@valencia.po (+2897/-0) po/gd.po (+2606/-0) scripts/dmi_resource (+55/-0) Conflict adding file checkbox/dispatcher.py. Moved existing file to checkbox/dispatcher.py.moved. Conflict adding file checkbox/parsers/cputable. Moved existing file to checkbox/parsers/cputable.moved. Conflict adding file checkbox/parsers/cputable.py. Moved existing file to checkbox/parsers/cputable.py.moved. Conflict adding file checkbox/parsers/deferred.py. Moved existing file to checkbox/parsers/deferred.py.moved. Conflict adding file checkbox/parsers/dmidecode.py. Moved existing file to checkbox/parsers/dmidecode.py.moved. Conflict adding file checkbox/parsers/meminfo.py. Moved existing file to checkbox/parsers/meminfo.py.moved. Contents conflict in checkbox/parsers/udevadm.py Conflict adding file debian/po/ro.po. Moved existing file to debian/po/ro.po.moved. Conflict adding file po/ca@valencia.po. Moved existing file to po/ca@valencia.po.moved. Conflict adding file po/gd.po. Moved existing file to po/gd.po.moved. Conflict adding file scripts/dmi_resource. Moved existing file to scripts/dmi_resource.moved. |
| To merge this branch: | bzr merge lp://qastaging/~roadmr/ubuntu/precise/checkbox/0.13 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ubuntu Sponsors | Pending | ||
|
Review via email:
|
|||
This proposal supersedes a proposal from 2011-11-18.
Description of the change
Updating target branches to precise
To post a comment you must log in.
Revision history for this message
| Sebastien Bacher (seb128) wrote | # |
Revision history for this message
| Daniel Manrique (roadmr) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Thank you for your work, I'm sponsoring it to precise but I can't set the merge request to merged since you targetted oneiric which is the wrong serie and launchpad will not let me edit it, could you do that?