Commit Graph

139 Commits

Author SHA1 Message Date
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 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 247ef7f6f7 Merge branch '1.11' into 1.12 2014-03-04 15:56:46 -08:00
Jeff Forcier 8f22672926 Merge branch '1.10' into 1.11 2014-03-04 15:54:16 -08:00
Jeff Forcier f295840191 Semi no-op fix to test RTD hooks 2014-03-04 15:45:01 -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 9ae46dcbfa Fix up AgentSSH vs Agent classes/docstrings, sigh 2014-02-24 17:00:53 -08:00
Jeff Forcier 4bcac18d17 Host key docs (order + tweaks) 2014-02-24 10:08:46 -08:00
Jeff Forcier 24cc59b64d Reorder config doc 2014-02-24 10:01:03 -08:00
Jeff Forcier c23579526b Tweak order of System doc page 2014-02-24 09:49:30 -08:00
Jeff Forcier 9ae62eb47a Wow there's a lot of SFTP crap. 2014-02-21 19:15:36 -08:00
Jeff Forcier 6d9b28c56c Remove win_pageant from docs for now :( too many freakin errors 2014-02-21 16:56:13 -08:00
Jeff Forcier 333dd249b0 Start in on the SFTP section 2014-02-21 16:37:16 -08:00
Jeff Forcier 0b2d523665 Connect to Python stdlib intersphinx 2014-02-21 15:35:22 -08:00
Jeff Forcier 0e9a5a4b46 Move module level docstring into Sphinx docs 2014-02-21 14:31:08 -08:00