Merge lp://staging/~cr3/checkbox/revert_sru into lp://staging/checkbox
Proposed by
Marc Tardif
| Status: | Merged |
|---|---|
| Merged at revision: | 1231 |
| Proposed branch: | lp://staging/~cr3/checkbox/revert_sru |
| Merge into: | lp://staging/checkbox |
| Diff against target: |
213 lines (+2/-114) 12 files modified
.bzrignore (+0/-2) bin/checkbox-sru (+0/-18) data/whitelists/sru.whitelist (+0/-28) debian/checkbox-sru.install (+0/-2) debian/checkbox-sru.links (+0/-1) debian/checkbox-sru.postinst (+0/-7) debian/control (+0/-9) debian/rules (+1/-3) examples/checkbox-sru.ini (+0/-5) jobs/sru.txt.in (+0/-4) scripts/sru_suspend (+0/-33) setup.py (+1/-2) |
| To merge this branch: | bzr merge lp://staging/~cr3/checkbox/revert_sru |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Daniel Manrique (community) | Approve | ||
|
Review via email:
|
|||
Description of the change
Only reverted SRU changes. There were other changes in revno 1148 about using the default.whitelist file which were preserved.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Thanks, merging!