Merge lp:~cjwatson/launchpad/code-import-push-bzr-ssh into lp:launchpad
Proposed by
Colin Watson
Status: | Merged |
---|---|
Merged at revision: | 18752 |
Proposed branch: | lp:~cjwatson/launchpad/code-import-push-bzr-ssh |
Merge into: | lp:launchpad |
Diff against target: |
61 lines (+29/-3) 2 files modified
lib/lp/codehosting/codeimport/tests/test_worker.py (+17/-0) lib/lp/codehosting/codeimport/worker.py (+12/-3) |
To merge this branch: | bzr merge lp:~cjwatson/launchpad/code-import-push-bzr-ssh |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
William Grant | code | Approve | |
Review via email: mp+353243@code.launchpad.net |
Commit message
Push code imports over bzr+ssh rather than sftp.
Description of the change
Some imports seem to hang when pushing to sftp; I can reproduce this when experimenting locally, but bzr+ssh fixes things (as long as SSH connection sharing is disabled).
I've done this here rather than in the production configs in order that we can carry on pulling over sftp, which is apparently less CPU-intensive.
To post a comment you must log in.