Jeff Forcier
|
09e9d48db0
|
Cut 1.12.4
|
2014-05-07 13:47:09 -07:00 |
Jeff Forcier
|
ec2460fb3c
|
Merge branch '1.11' into 1.12
Conflicts:
paramiko/__init__.py
setup.py
|
2014-05-07 13:40:19 -07:00 |
Jeff Forcier
|
c0667e1e6a
|
Cut 1.11.6
|
2014-05-07 13:39:39 -07:00 |
Jeff Forcier
|
e6f9f03b08
|
Merge branch '1.11' into 1.12
|
2014-04-24 09:34:00 -07:00 |
Jeff Forcier
|
ac4c754718
|
Fix incorrect monospacing
|
2014-04-24 09:33:56 -07:00 |
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
|
f22fe4b600
|
Merge branch '1.11' into 1.12
|
2014-04-01 13:28:56 -07:00 |
Jeff Forcier
|
dd2e23a23e
|
Merge branch '1.10' into 1.11
|
2014-04-01 13:28:56 -07:00 |
Jeff Forcier
|
658d202cc7
|
This setting no longer needed & causes warnings if left in
|
2014-04-01 13:28:54 -07:00 |
Jeff Forcier
|
cb6c4bec5d
|
Merge branch '1.11' into 1.12
|
2014-04-01 11:13:28 -07:00 |
Jeff Forcier
|
e65b627021
|
Merge branch '1.10' into 1.11
|
2014-04-01 11:13:28 -07:00 |
Jeff Forcier
|
e1d92087fa
|
Minor site cleanup
|
2014-04-01 11:13:26 -07:00 |
Jeff Forcier
|
619b24738a
|
Merge branch '1.11' into 1.12
|
2014-03-31 16:19:55 -07:00 |
Jeff Forcier
|
9044860b41
|
Merge branch '1.10' into 1.11
|
2014-03-31 16:19:55 -07:00 |
Jeff Forcier
|
c9aa83b63e
|
Link back to WWW in docs sidebar
|
2014-03-31 16:19:40 -07: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
|
341a666351
|
Revert "Add a setup.cfg identifying this package as universal"
This reverts commit 61e32319fc .
|
2014-03-22 18:24:21 -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
|
c5fff0c399
|
Merge branch '1.11' into 1.12
|
2014-03-21 18:09:56 -07:00 |
Alex Gaynor
|
61e32319fc
|
Add a setup.cfg identifying this package as universal
Meaning that it's build is not system dependent. Which it's not, because it's pure python. Refs #275
|
2014-03-21 18:09:51 -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
|
4ba5ae6135
|
Merge branch '1.11' into 1.12
|
2014-03-21 11:21:20 -07:00 |
Jeff Forcier
|
2af6081eaf
|
Forgot python 2.5
|
2014-03-21 11:21:17 -07:00 |
Jeff Forcier
|
a749c83aa8
|
Merge branch '1.11' into 1.12
Conflicts:
setup.py
|
2014-03-21 11:16:51 -07:00 |
Jeff Forcier
|
695527c9ee
|
Indent/order shuffle, no actionable changes
|
2014-03-21 11:09:31 -07:00 |
Jeff Forcier
|
233f53bb37
|
Backport alex/patch-2, Python trove classifiers
|
2014-03-21 11:06:15 -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
|
bbd9469d65
|
Cut 1.12.3
|
2014-03-13 21:30:11 -07:00 |
Jeff Forcier
|
edf958b74b
|
Merge branch '1.11' into 1.12
|
2014-03-13 21:29:19 -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
|
e694fa243c
|
Merge branch '1.11' into 1.12
|
2014-03-05 09:56:32 -08:00 |
Jeff Forcier
|
148f3d2fd4
|
Merge branch '1.10' into 1.11
|
2014-03-05 09:56:28 -08:00 |
Jeff Forcier
|
6d00e03d75
|
Seriously, no more epydoc!
|
2014-03-05 09:56:25 -08:00 |
Jeff Forcier
|
feb78d8a3f
|
Merge branch '1.11' into 1.12
|
2014-03-05 09:55:19 -08:00 |
Jeff Forcier
|
48ab72508a
|
No more epydoc, part 2
|
2014-03-05 09:55:16 -08:00 |
Jeff Forcier
|
38785d9cd2
|
Merge branch '1.11' into 1.12
|
2014-03-04 16:16:36 -08:00 |