Merge lp:~vila/bzr/1579093-paramako-compat into lp:bzr/2.7
Proposed by
Vincent Ladeuil
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Vincent Ladeuil | ||||
Approved revision: | no longer in the source branch. | ||||
Merge reported by: | bzr PQM | ||||
Merged at revision: | not available | ||||
Proposed branch: | lp:~vila/bzr/1579093-paramako-compat | ||||
Merge into: | lp:bzr/2.7 | ||||
Diff against target: |
35 lines (+13/-1) 2 files modified
bzrlib/transport/sftp.py (+2/-1) doc/en/release-notes/bzr-2.7.txt (+11/-0) |
||||
To merge this branch: | bzr merge lp:~vila/bzr/1579093-paramako-compat | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Vincent Ladeuil | Approve | ||
Review via email: mp+311890@code.launchpad.net |
Commit message
Cope with paramiko making argument to SFTPFile.prefetch() mandatory.
Description of the change
This fixes bug #1579093 by coping with paramiko making argument to SFTPFile.prefetch() mandatory.
The original patch from Jelmer has landed in debian sid for a while as well as in ubuntu.
This is a pre-requisite to enable the new CI system as tests are currently failing on trunk.
To post a comment you must log in.
Self-approving as the patch is known to work and is blocking landings.