Jeff Forcier
|
4947a726c1
|
Merge branch '1.11' into 1.12
|
2014-04-16 15:51:04 -04:00 |
|
Jeff Forcier
|
30f6f98afd
|
Added self.args for exception classes. Used for unpickling
Related to fabric/fabric#986 and fabric/fabric#714
Conflicts:
sites/www/changelog.rst
|
2014-04-16 15:51:01 -04:00 |
|
Jeff Forcier
|
a0b2ae293f
|
Merge branch '1.11' into 1.12
|
2014-04-16 15:09:30 -04:00 |
|
Jeff Forcier
|
6e9abc39cf
|
Fix logging error in sftp_client for filenames containing the character.
Bug reported here:
http://vlists.pepperfish.net/pipermail/obnam-flarn.net/2013-May/000767.html
Antoine Brenner
Backported to 1.11 by @bitprophet
Conflicts:
paramiko/sftp_client.py
sites/www/changelog.rst
tests/test_sftp.py
|
2014-04-16 15:07:56 -04:00 |
|
Jeff Forcier
|
4d76a90985
|
Merge branch '1.11' into 1.12
|
2014-03-22 18:24:37 -07:00 |
|
Jeff Forcier
|
bd81c94825
|
Revert "Changelog fixes #290"
This reverts commit 270dacaf33.
|
2014-03-22 18:24:28 -07:00 |
|
Jeff Forcier
|
d4e98d8d77
|
Merge branch '1.11' into 1.12
|
2014-03-22 18:02:28 -07:00 |
|
Jeff Forcier
|
270dacaf33
|
Changelog fixes #290
|
2014-03-22 17:59:21 -07:00 |
|
Jeff Forcier
|
fb6047df36
|
Merge branch '1.11' into 1.12
|
2014-03-21 17:29:38 -07:00 |
|
Jeff Forcier
|
13cadb2a1f
|
Merge branch '1.10' into 1.11
|
2014-03-21 17:29:35 -07:00 |
|
Jeff Forcier
|
4cc9d9f562
|
Uggh how did this slip in
|
2014-03-21 17:29:31 -07:00 |
|
Jeff Forcier
|
3780c0314c
|
Merge branch '1.11' into 1.12
|
2014-03-21 11:23:06 -07:00 |
|
Jeff Forcier
|
2c0544fc35
|
Changelog re #284
|
2014-03-21 11:23:03 -07:00 |
|
Jeff Forcier
|
a8ad23e61a
|
Merge branch '1.11' into 1.12
Conflicts:
sites/www/changelog.rst
|
2014-03-13 21:52:56 -07:00 |
|
Jeff Forcier
|
9ad2dec32a
|
Improve string type testing in Python 2.x versions
|
2014-03-13 21:52:34 -07:00 |
|
Jeff Forcier
|
b94af130b5
|
Changelog for 1.12.3
|
2014-03-13 21:36:26 -07:00 |
|
Jeff Forcier
|
005cfb8b25
|
Merge branch '1.11' into 1.12
Conflicts:
sites/www/changelog.rst
|
2014-03-13 21:36:05 -07:00 |
|
Jeff Forcier
|
4e9efe4830
|
Changelog for 1.11.5
|
2014-03-13 21:35:48 -07:00 |
|
Jeff Forcier
|
c538a00012
|
Merge branch '1.10' into 1.11.
Also bump versions like a dummy.
Conflicts:
paramiko/__init__.py
setup.py
|
2014-03-13 21:27:46 -07:00 |
|
Jeff Forcier
|
4fdb4b5ae5
|
Cut 1.10.7
|
2014-03-13 21:25:44 -07:00 |
|
Jeff Forcier
|
38785d9cd2
|
Merge branch '1.11' into 1.12
|
2014-03-04 16:16:36 -08:00 |
|
Jeff Forcier
|
d5ed558c21
|
Merge branch '1.10' into 1.11
|
2014-03-04 16:16:33 -08:00 |
|
Jeff Forcier
|
798e3689dd
|
Note Sphinx docs issue was backported
|
2014-03-04 16:16:29 -08:00 |
|
Jeff Forcier
|
fac6cde874
|
Merge branch '1.11' into 1.12
Conflicts:
paramiko/hostkeys.py
|
2014-03-04 11:44:57 -08:00 |
|
Jeff Forcier
|
72a73f55fa
|
Merge branch '1.10' into 1.11
Conflicts:
fabfile.py
paramiko/__init__.py
|
2014-03-03 18:24:04 -08:00 |
|
Jeff Forcier
|
056323979d
|
Re-enable Intersphinx from www -> docs
|
2014-03-03 18:22:33 -08:00 |
|
Jeff Forcier
|
83f09e634f
|
Changelog re #256
|
2014-03-03 17:30:15 -08:00 |
|
Jeff Forcier
|
0965eaa65d
|
Merge branch '1.11' into 1.12
Conflicts:
paramiko/hostkeys.py
sites/www/changelog.rst
|
2014-02-14 11:54:39 -08:00 |
|
Jeff Forcier
|
4e9af2f7ca
|
Merge branch '1.10' into 1.11
Conflicts:
sites/www/changelog.rst
|
2014-02-14 11:53:59 -08:00 |
|
Jeff Forcier
|
30518280f1
|
Changelog re hash comparison bugfix
|
2014-02-14 11:53:42 -08:00 |
|
Jeff Forcier
|
fb786bea9c
|
Cut 1.12.2
|
2014-02-14 09:39:11 -08:00 |
|
Jeff Forcier
|
33d412a2c6
|
Merge branch '1.11' into 1.12
Conflicts:
paramiko/__init__.py
setup.py
|
2014-02-14 09:38:40 -08:00 |
|
Jeff Forcier
|
4a5f007c02
|
Cut 1.11.4
|
2014-02-14 09:38:14 -08:00 |
|
Jeff Forcier
|
7b595f4a8b
|
Merge branch '1.10' into 1.11
Conflicts:
paramiko/__init__.py
setup.py
sites/www/changelog.rst
|
2014-02-14 09:37:34 -08:00 |
|
Jeff Forcier
|
457a34f55b
|
Cut 1.10.6
|
2014-02-14 09:36:33 -08:00 |
|
Jeff Forcier
|
ddea189319
|
Merge branch '1.11' into 1.12
|
2014-02-14 09:32:08 -08:00 |
|
Jeff Forcier
|
6d4b37a17f
|
Catch & patch trimming
|
2014-02-14 09:32:05 -08:00 |
|
Jeff Forcier
|
758543f238
|
Merge branch '1.11' into 1.12
|
2014-02-14 09:16:43 -08:00 |
|
Jeff Forcier
|
fb772a8695
|
Tweak changelog language
|
2014-02-14 09:16:35 -08:00 |
|
Jeff Forcier
|
e3a16fac5a
|
Braino in changelog text
|
2014-02-13 13:48:21 -08:00 |
|
Jeff Forcier
|
8003c738ca
|
I hate you sometimes, ReST
|
2014-02-13 09:50:05 -08:00 |
|
Jeff Forcier
|
c3eb903ed3
|
Preliminary changelog entry re #252
|
2014-02-13 09:48:58 -08:00 |
|
Jeff Forcier
|
0c493541eb
|
Changelog re #268
|
2014-02-13 09:40:53 -08:00 |
|
Jeff Forcier
|
3a7b66a814
|
Merge branch '1.11' into 1.12
Conflicts:
sites/www/changelog.rst
|
2014-02-11 14:26:34 -08:00 |
|
Jeff Forcier
|
41d7339992
|
Merge branch '1.10' into 1.11
Conflicts:
sites/www/changelog.rst
|
2014-02-11 14:23:50 -08:00 |
|
Jeff Forcier
|
c142454621
|
Start reverting explicit-release stuff in favor of release-line specifiers on bugs.
|
2014-02-11 14:23:15 -08:00 |
|
Jeff Forcier
|
36b937d436
|
Merge branch '1.10' into 1.11
|
2014-02-11 09:48:00 -08:00 |
|
Jeff Forcier
|
0a2887a8cc
|
Changelog re #35
|
2014-02-10 17:59:32 -08:00 |
|
Jeff Forcier
|
fe3d3beca4
|
Fix extra colon in changelog
|
2014-02-10 17:59:25 -08:00 |
|
Jeff Forcier
|
c7090c52de
|
Merge branch '1.11' into 1.12
|
2014-02-03 14:11:00 -08:00 |