Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Cut 1.12.4v1.12.41.12.41.12 | Jeff Forcier | 2014-05-07 | 3 | -2/+3 |
| | |||||
* | Merge branch '1.11' into 1.12 | Jeff Forcier | 2014-05-07 | 1 | -0/+1 |
|\ | | | | | | | | | | | Conflicts: paramiko/__init__.py setup.py | ||||
| * | Cut 1.11.6v1.11.61.11.61.11 | Jeff Forcier | 2014-05-07 | 3 | -2/+3 |
| | | |||||
* | | Merge branch '1.11' into 1.12 | Jeff Forcier | 2014-04-24 | 1 | -2/+2 |
|\ \ | |/ | |||||
| * | Fix incorrect monospacing | Jeff Forcier | 2014-04-24 | 1 | -2/+2 |
| | | |||||
* | | Merge branch '1.11' into 1.12 | Jeff Forcier | 2014-04-16 | 2 | -1/+15 |
|\ \ | |/ | |||||
| * | Added self.args for exception classes. Used for unpickling | Jeff Forcier | 2014-04-16 | 2 | -1/+15 |
| | | | | | | | | | | | | | | Related to fabric/fabric#986 and fabric/fabric#714 Conflicts: sites/www/changelog.rst | ||||
* | | Merge branch '1.11' into 1.12 | Jeff Forcier | 2014-04-16 | 3 | -2/+29 |
|\ \ | |/ | |||||
| * | Fix logging error in sftp_client for filenames containing the character. | Jeff Forcier | 2014-04-16 | 3 | -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.12 | Jeff Forcier | 2014-04-01 | 1 | -1/+0 |
|\ \ | |/ | |||||
| * | Merge branch '1.10' into 1.11 | Jeff Forcier | 2014-04-01 | 1 | -1/+0 |
| |\ | |||||
| | * | This setting no longer needed & causes warnings if left in1.10 | Jeff Forcier | 2014-04-01 | 1 | -1/+0 |
| | | | |||||
* | | | Merge branch '1.11' into 1.12 | Jeff Forcier | 2014-04-01 | 2 | -2/+0 |
|\ \ \ | |/ / | |||||
| * | | Merge branch '1.10' into 1.11 | Jeff Forcier | 2014-04-01 | 2 | -2/+0 |
| |\ \ | | |/ | |||||
| | * | Minor site cleanup | Jeff Forcier | 2014-04-01 | 2 | -2/+0 |
| | | | |||||
* | | | Merge branch '1.11' into 1.12 | Jeff Forcier | 2014-03-31 | 1 | -0/+5 |
|\ \ \ | |/ / | |||||
| * | | Merge branch '1.10' into 1.11 | Jeff Forcier | 2014-03-31 | 1 | -0/+5 |
| |\ \ | | |/ | |||||
| | * | Link back to WWW in docs sidebar | Jeff Forcier | 2014-03-31 | 1 | -0/+5 |
| | | | |||||
* | | | Merge branch '1.11' into 1.12 | Jeff Forcier | 2014-03-22 | 2 | -4/+0 |
|\ \ \ | |/ / | |||||
| * | | Revert "Changelog fixes #290" | Jeff Forcier | 2014-03-22 | 1 | -2/+0 |
| | | | | | | | | | | | | This reverts commit 270dacaf33279bed2ae599d718183cec541e032d. | ||||
| * | | Revert "Add a setup.cfg identifying this package as universal" | Jeff Forcier | 2014-03-22 | 1 | -2/+0 |
| | | | | | | | | | | | | This reverts commit 61e32319fc9f0390818e518a4890766d1253a165. | ||||
* | | | Merge branch '1.11' into 1.12 | Jeff Forcier | 2014-03-22 | 1 | -0/+2 |
|\ \ \ | |/ / | |||||
| * | | Changelog fixes #290 | Jeff Forcier | 2014-03-22 | 1 | -0/+2 |
| | | | |||||
* | | | Merge branch '1.11' into 1.12 | Jeff Forcier | 2014-03-21 | 1 | -0/+2 |
|\ \ \ | |/ / | |||||
| * | | Add a setup.cfg identifying this package as universal | Alex Gaynor | 2014-03-21 | 1 | -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.12 | Jeff Forcier | 2014-03-21 | 1 | -1/+1 |
|\ \ \ | |/ / | |||||
| * | | Merge branch '1.10' into 1.11 | Jeff Forcier | 2014-03-21 | 1 | -1/+1 |
| |\ \ | | |/ | |||||
| | * | Uggh how did this slip in | Jeff Forcier | 2014-03-21 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch '1.11' into 1.12 | Jeff Forcier | 2014-03-21 | 1 | -0/+2 |
|\ \ \ | |/ / | |||||
| * | | Changelog re #284 | Jeff Forcier | 2014-03-21 | 1 | -0/+2 |
| | | | |||||
* | | | Merge branch '1.11' into 1.12 | Jeff Forcier | 2014-03-21 | 1 | -0/+1 |
|\ \ \ | |/ / | |||||
| * | | Forgot python 2.5 | Jeff Forcier | 2014-03-21 | 1 | -0/+1 |
| | | | |||||
* | | | Merge branch '1.11' into 1.12 | Jeff Forcier | 2014-03-21 | 1 | -18/+26 |
|\ \ \ | |/ / | | | | | | | | | | Conflicts: setup.py | ||||
| * | | Indent/order shuffle, no actionable changes | Jeff Forcier | 2014-03-21 | 1 | -23/+26 |
| | | | |||||
| * | | Backport alex/patch-2, Python trove classifiers | Jeff Forcier | 2014-03-21 | 1 | -1/+6 |
| | | | |||||
* | | | Merge branch '1.11' into 1.12 | Jeff Forcier | 2014-03-13 | 4 | -3/+6 |
|\ \ \ | |/ / | | | | | | | | | | Conflicts: sites/www/changelog.rst | ||||
| * | | Improve string type testing in Python 2.x versions | Jeff Forcier | 2014-03-13 | 4 | -3/+6 |
| | | | |||||
* | | | Changelog for 1.12.3 | Jeff Forcier | 2014-03-13 | 1 | -0/+1 |
| | | | |||||
* | | | Merge branch '1.11' into 1.12 | Jeff Forcier | 2014-03-13 | 1 | -0/+2 |
|\ \ \ | |/ / | | | | | | | | | | Conflicts: sites/www/changelog.rst | ||||
| * | | Changelog for 1.11.5 | Jeff Forcier | 2014-03-13 | 1 | -0/+1 |
| | | | |||||
* | | | Cut 1.12.3v1.12.31.12.3 | Jeff Forcier | 2014-03-13 | 2 | -2/+2 |
| | | | |||||
* | | | Merge branch '1.11' into 1.12 | Jeff Forcier | 2014-03-13 | 0 | -0/+0 |
|\ \ \ | |/ / | |||||
| * | | Merge branch '1.10' into 1.11.v1.11.51.11.5 | Jeff Forcier | 2014-03-13 | 3 | -2/+3 |
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | Also bump versions like a dummy. Conflicts: paramiko/__init__.py setup.py | ||||
| | * | Cut 1.10.7v1.10.71.10.7 | Jeff Forcier | 2014-03-13 | 3 | -2/+3 |
| | | | |||||
* | | | Merge branch '1.11' into 1.12 | Jeff Forcier | 2014-03-05 | 1 | -4/+1 |
|\ \ \ | |/ / | |||||
| * | | Merge branch '1.10' into 1.11 | Jeff Forcier | 2014-03-05 | 1 | -4/+1 |
| |\ \ | | |/ | |||||
| | * | Seriously, no more epydoc! | Jeff Forcier | 2014-03-05 | 1 | -4/+1 |
| | | | |||||
* | | | Merge branch '1.11' into 1.12 | Jeff Forcier | 2014-03-05 | 1 | -1/+0 |
|\ \ \ | |/ / | |||||
| * | | No more epydoc, part 2 | Jeff Forcier | 2014-03-05 | 1 | -1/+0 |
| | | | |||||
* | | | Merge branch '1.11' into 1.12 | Jeff Forcier | 2014-03-04 | 1 | -3/+3 |
|\ \ \ | |/ / |