Merge lp://staging/~chipaca/ubuntu/lucid/desktopcouch/fix-834857 into lp://staging/ubuntu/lucid/desktopcouch
Proposed by
John Lenton
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Merge reported by: | Martin Pitt | ||||
| Merged at revision: | not available | ||||
| Proposed branch: | lp://staging/~chipaca/ubuntu/lucid/desktopcouch/fix-834857 | ||||
| Merge into: | lp://staging/ubuntu/lucid/desktopcouch | ||||
| Diff against target: |
129 lines (+85/-3) 4 files modified
debian/changelog (+14/-0) debian/control (+4/-2) debian/patches/lp_726597.patch (+66/-0) desktopcouch/replication.py (+1/-1) |
||||
| To merge this branch: | bzr merge lp://staging/~chipaca/ubuntu/lucid/desktopcouch/fix-834857 | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Martin Pitt | Approve | ||
|
Review via email:
|
|||
Description of the change
Bump the replication period to 1h.
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
The branches here are messed up quite a bit, so I just applied the patch manually and uploaded. Thanks!