summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Cut 1.12.4v1.12.41.12.41.12Jeff Forcier2014-05-073-2/+3
|
* Merge branch '1.11' into 1.12Jeff Forcier2014-05-071-0/+1
|\ | | | | | | | | | | Conflicts: paramiko/__init__.py setup.py
| * Cut 1.11.6v1.11.61.11.61.11Jeff Forcier2014-05-073-2/+3
| |
* | Merge branch '1.11' into 1.12Jeff Forcier2014-04-241-2/+2
|\ \ | |/
| * Fix incorrect monospacingJeff Forcier2014-04-241-2/+2
| |
* | Merge branch '1.11' into 1.12Jeff Forcier2014-04-162-1/+15
|\ \ | |/
| * Added self.args for exception classes. Used for unpicklingJeff Forcier2014-04-162-1/+15
| | | | | | | | | | | | | | Related to fabric/fabric#986 and fabric/fabric#714 Conflicts: sites/www/changelog.rst
* | Merge branch '1.11' into 1.12Jeff Forcier2014-04-163-2/+29
|\ \ | |/
| * Fix logging error in sftp_client for filenames containing the character.Jeff Forcier2014-04-163-2/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | Merge branch '1.11' into 1.12Jeff Forcier2014-04-011-1/+0
|\ \ | |/
| * Merge branch '1.10' into 1.11Jeff Forcier2014-04-011-1/+0
| |\
| | * This setting no longer needed & causes warnings if left in1.10Jeff Forcier2014-04-011-1/+0
| | |
* | | Merge branch '1.11' into 1.12Jeff Forcier2014-04-012-2/+0
|\ \ \ | |/ /
| * | Merge branch '1.10' into 1.11Jeff Forcier2014-04-012-2/+0
| |\ \ | | |/
| | * Minor site cleanupJeff Forcier2014-04-012-2/+0
| | |
* | | Merge branch '1.11' into 1.12Jeff Forcier2014-03-311-0/+5
|\ \ \ | |/ /
| * | Merge branch '1.10' into 1.11Jeff Forcier2014-03-311-0/+5
| |\ \ | | |/
| | * Link back to WWW in docs sidebarJeff Forcier2014-03-311-0/+5
| | |
* | | Merge branch '1.11' into 1.12Jeff Forcier2014-03-222-4/+0
|\ \ \ | |/ /
| * | Revert "Changelog fixes #290"Jeff Forcier2014-03-221-2/+0
| | | | | | | | | | | | This reverts commit 270dacaf33279bed2ae599d718183cec541e032d.
| * | Revert "Add a setup.cfg identifying this package as universal"Jeff Forcier2014-03-221-2/+0
| | | | | | | | | | | | This reverts commit 61e32319fc9f0390818e518a4890766d1253a165.
* | | Merge branch '1.11' into 1.12Jeff Forcier2014-03-221-0/+2
|\ \ \ | |/ /
| * | Changelog fixes #290Jeff Forcier2014-03-221-0/+2
| | |
* | | Merge branch '1.11' into 1.12Jeff Forcier2014-03-211-0/+2
|\ \ \ | |/ /
| * | Add a setup.cfg identifying this package as universalAlex Gaynor2014-03-211-0/+2
| | | | | | | | | | | | Meaning that it's build is not system dependent. Which it's not, because it's pure python. Refs #275
* | | Merge branch '1.11' into 1.12Jeff Forcier2014-03-211-1/+1
|\ \ \ | |/ /
| * | Merge branch '1.10' into 1.11Jeff Forcier2014-03-211-1/+1
| |\ \ | | |/
| | * Uggh how did this slip inJeff Forcier2014-03-211-1/+1
| | |
* | | Merge branch '1.11' into 1.12Jeff Forcier2014-03-211-0/+2
|\ \ \ | |/ /
| * | Changelog re #284Jeff Forcier2014-03-211-0/+2
| | |
* | | Merge branch '1.11' into 1.12Jeff Forcier2014-03-211-0/+1
|\ \ \ | |/ /
| * | Forgot python 2.5Jeff Forcier2014-03-211-0/+1
| | |
* | | Merge branch '1.11' into 1.12Jeff Forcier2014-03-211-18/+26
|\ \ \ | |/ / | | | | | | | | | Conflicts: setup.py
| * | Indent/order shuffle, no actionable changesJeff Forcier2014-03-211-23/+26
| | |
| * | Backport alex/patch-2, Python trove classifiersJeff Forcier2014-03-211-1/+6
| | |
* | | Merge branch '1.11' into 1.12Jeff Forcier2014-03-134-3/+6
|\ \ \ | |/ / | | | | | | | | | Conflicts: sites/www/changelog.rst
| * | Improve string type testing in Python 2.x versionsJeff Forcier2014-03-134-3/+6
| | |
* | | Changelog for 1.12.3Jeff Forcier2014-03-131-0/+1
| | |
* | | Merge branch '1.11' into 1.12Jeff Forcier2014-03-131-0/+2
|\ \ \ | |/ / | | | | | | | | | Conflicts: sites/www/changelog.rst
| * | Changelog for 1.11.5Jeff Forcier2014-03-131-0/+1
| | |
* | | Cut 1.12.3v1.12.31.12.3Jeff Forcier2014-03-132-2/+2
| | |
* | | Merge branch '1.11' into 1.12Jeff Forcier2014-03-130-0/+0
|\ \ \ | |/ /
| * | Merge branch '1.10' into 1.11.v1.11.51.11.5Jeff Forcier2014-03-133-2/+3
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | Also bump versions like a dummy. Conflicts: paramiko/__init__.py setup.py
| | * Cut 1.10.7v1.10.71.10.7Jeff Forcier2014-03-133-2/+3
| | |
* | | Merge branch '1.11' into 1.12Jeff Forcier2014-03-051-4/+1
|\ \ \ | |/ /
| * | Merge branch '1.10' into 1.11Jeff Forcier2014-03-051-4/+1
| |\ \ | | |/
| | * Seriously, no more epydoc!Jeff Forcier2014-03-051-4/+1
| | |
* | | Merge branch '1.11' into 1.12Jeff Forcier2014-03-051-1/+0
|\ \ \ | |/ /
| * | No more epydoc, part 2Jeff Forcier2014-03-051-1/+0
| | |
* | | Merge branch '1.11' into 1.12Jeff Forcier2014-03-041-3/+3
|\ \ \ | |/ /