summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Cut 1.14v1.14.01.14.0baserock/morphJeff Forcier2014-05-073-2/+3
* Bump alabaster for things like travis_buttonJeff Forcier2014-05-071-1/+1
* Merge branch '1.13'Jeff Forcier2014-05-071-0/+1
|\
| * Need wheel to build wheels!Jeff Forcier2014-05-071-0/+1
* | Merge branch '1.13'Jeff Forcier2014-05-073-2/+5
|\ \ | |/
| * Cut 1.13.1v1.13.11.13.1Jeff Forcier2014-05-073-2/+3
| * Merge branch '1.12' into 1.13Jeff Forcier2014-05-071-0/+2
| |\
| | * 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
| | |\
| | | * Cut 1.11.6v1.11.61.11.61.11Jeff Forcier2014-05-073-2/+3
* | | | Merge branch 'master' of github.com:paramiko/paramikoJeff Forcier2014-04-241-1/+1
|\ \ \ \
| * \ \ \ Merge pull request #307 from offbyone/tox-py25Jeff Forcier2014-04-161-1/+1
| |\ \ \ \
| | * | | | Remove python 2.5 from toxChris Rose2014-04-141-1/+1
* | | | | | Merge branch '1.13'Jeff Forcier2014-04-242-5/+37
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | FormattingJeff Forcier2014-04-241-1/+2
| * | | | | Fix some trailing whitespaceJeff Forcier2014-04-242-3/+3
| * | | | | Merge updated a01e449 from al-tonioJeff Forcier2014-04-242-4/+35
* | | | | | Merge branch '1.13'Jeff Forcier2014-04-240-0/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Use newer alabaster w/ showhidden in sidebar TOCJeff Forcier2014-04-242-1/+3
| * | | | | README py3 updateJeff Forcier2014-04-241-1/+2
* | | | | | Merge branch '1.13'Jeff Forcier2014-04-240-0/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Show Travis status in website sidebarJeff Forcier2014-04-241-0/+1
| * | | | | Errything uses intersphinx to PythonJeff Forcier2014-04-243-10/+8
| * | | | | Nuke Fab-oriented link color overrideJeff Forcier2014-04-241-3/+0
| * | | | | FormattingJeff Forcier2014-04-241-3/+4
| * | | | | Update copyright in README to be more accurateJeff Forcier2014-04-241-1/+1
* | | | | | Merge branch '1.13'Jeff Forcier2014-04-246-34/+60
|\ \ \ \ \ \ | |/ / / / / | | / / / / | |/ / / / |/| | | |
| * | | | Merge branch '1.12' into 1.13Jeff Forcier2014-04-240-0/+0
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Merge branch '1.11' into 1.12Jeff Forcier2014-04-241-2/+2
| | |\ \ \ | | | | |/ | | | |/|
| | | * | Fix incorrect monospacingJeff Forcier2014-04-241-2/+2
| * | | | Fix incorrect monospacingJeff Forcier2014-04-241-2/+2
| * | | | Reword docs/changelog re #315Jeff Forcier2014-04-242-17/+22
| * | | | BufferedFile.read() now returns byte strings instead of text stringsAntoine Brenner2014-04-175-33/+54
* | | | | Merge branch '1.13'Jeff Forcier2014-04-162-1/+15
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch '1.12' into 1.13Jeff Forcier2014-04-162-1/+15
| |\ \ \ \ | | |/ / /
| | * | | 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
* | | | | Merge branch '1.13'Jeff Forcier2014-04-163-1/+22
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch '1.12' into 1.13Jeff Forcier2014-04-163-1/+22
| |\ \ \ \ | | |/ / /
| | * | | 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
* | | | | Show Travis status in website sidebarJeff Forcier2014-04-151-0/+1
* | | | | Merge branch '1.13'Jeff Forcier2014-04-142-2/+4
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #310 from offbyone/fix-sporadic-test-failuresJeff Forcier2014-04-142-2/+4
| |\ \ \ \
| | * | | | Revert a regression in DSS key generationChris Rose2014-04-142-2/+4
| |/ / / /
* | | | | Note changelog location in contribution docsJeff Forcier2014-04-141-0/+3
* | | | | Changelog, closes #299Jeff Forcier2014-04-141-0/+2
* | | | | Merge branch 'master' into ecdsa-deterministicAlex Gaynor2014-04-1419-77/+69
|\ \ \ \ \
| * | | | | Changelog, closes #297Jeff Forcier2014-04-141-0/+2
| * | | | | Merge branch 'master' into use-urandomAlex Gaynor2014-04-1427-289/+86
| |\ \ \ \ \