Age | Commit message (Collapse) | Author |
|
|
|
|
|
|
|
|
|
Also bump versions like a dummy.
Conflicts:
paramiko/__init__.py
setup.py
|
|
|
|
|
|
Merged-to-master Python 3 branch
|
|
|
|
|
|
|
|
|
|
python3
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Hooray for manually applied diffs =/
|
|
|
|
Maybe that whitespace merge flag was not so great an idea.
|
|
python3
Conflicts:
dev-requirements.txt
paramiko/__init__.py
paramiko/file.py
paramiko/hostkeys.py
paramiko/message.py
paramiko/proxy.py
paramiko/server.py
paramiko/transport.py
paramiko/util.py
paramiko/win_pageant.py
setup.py
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|