Merge lp:~jml/launchpad/twisted-services into lp:launchpad
Proposed by
Jonathan Lange
Status: | Merged |
---|---|
Approved by: | Jonathan Lange |
Approved revision: | no longer in the source branch. |
Merged at revision: | not available |
Proposed branch: | lp:~jml/launchpad/twisted-services |
Merge into: | lp:launchpad |
Diff against target: |
353 lines (+46/-45) 17 files modified
cronscripts/supermirror-pull.py (+2/-2) lib/lp/buildmaster/manager.py (+2/-1) lib/lp/codehosting/codeimport/tests/test_workermonitor.py (+5/-5) lib/lp/codehosting/codeimport/workermonitor.py (+4/-4) lib/lp/codehosting/puller/scheduler.py (+3/-3) lib/lp/codehosting/puller/tests/test_scheduler.py (+8/-8) lib/lp/codehosting/sftp.py (+2/-2) lib/lp/codehosting/sshserver/accesslog.py (+1/-1) lib/lp/codehosting/sshserver/service.py (+2/-3) lib/lp/codehosting/sshserver/tests/test_auth.py (+2/-2) lib/lp/codehosting/vfs/transport.py (+2/-1) lib/lp/services/job/runner.py (+3/-3) lib/lp/services/twistedsupport/tests/test_loggingsupport.py (+3/-3) lib/lp/services/twistedsupport/tests/test_processmonitor.py (+3/-3) lib/lp/services/twistedsupport/tests/test_task.py (+1/-1) lib/lp/services/twistedsupport/tests/test_twistedsupport.py (+2/-2) scripts/code-import-worker-monitor.py (+1/-1) |
To merge this branch: | bzr merge lp:~jml/launchpad/twisted-services |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Abel Deuring (community) | code | Approve | |
Review via email: mp+21716@code.launchpad.net |
Commit message
Move canonical.
Description of the change
This patch moves canonical.
It cleans up some flakes along the way and orders imports correctly.
To post a comment you must log in.