summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Cut 2.1.02.1.0Jeff Forcier2016-12-092-1/+2
* Merge branch '2.0'Jeff Forcier2016-12-093-4/+26
|\
| * Cut 2.0.32.0.3Jeff Forcier2016-12-092-1/+2
| * Merge branch '1.18' into 2.0Jeff Forcier2016-12-092-3/+24
| |\
| | * Cut 1.18.0v1.18.01.18.0Jeff Forcier2016-12-092-1/+2
| | * Merge branch '1.17' into 1.18Jeff Forcier2016-12-093-4/+24
| | |\
| | | * Cut 1.17.3v1.17.31.17.3Jeff Forcier2016-12-092-1/+2
| | | * Weave in newer release invocations tasksJeff Forcier2016-12-091-3/+22
* | | | Merge branch '2.0'Jeff Forcier2016-12-051-1/+2
|\ \ \ \ | |/ / /
| * | | Merge branch '1.18' into 2.0Jeff Forcier2016-12-051-1/+2
| |\ \ \ | | |/ /
| | * | Merge branch '1.17' into 1.18Jeff Forcier2016-12-051-1/+2
| | |\ \ | | | |/
| | | * Looks like skipIf was added in 2.7? Dies on 2.6Jeff Forcier2016-12-051-1/+2
* | | | Merge branch '2.0'Jeff Forcier2016-12-052-1/+4
|\ \ \ \ | |/ / /
| * | | Merge branch '1.18' into 2.0Jeff Forcier2016-12-052-1/+4
| |\ \ \ | | |/ /
| | * | Merge branch '1.17' into 1.18Jeff Forcier2016-12-052-1/+4
| | |\ \ | | | |/
| | | * Make changelog re #802, re #802 more meaningful for us downstream folksJeff Forcier2016-12-051-2/+3
| | | * Update GlobalAlloc argtypes per jaraco.windows 3.6.2. Fixes #802.Jason R. Coombs2016-12-052-1/+3
* | | | Merge branch '2.0'Jeff Forcier2016-12-052-2/+6
|\ \ \ \ | |/ / /
| * | | Merge branch '1.18' into 2.0Jeff Forcier2016-12-052-2/+6
| |\ \ \ | | |/ /
| | * | Merge branch '1.17' into 1.18Jeff Forcier2016-12-052-2/+6
| | |\ \ | | | |/
| | | * Changelog re #824Jeff Forcier2016-12-051-0/+5
| | | * open() function does not support setting file permissionsJohn L. Villalovos2016-12-051-2/+1
* | | | Merge branch '2.0'Jeff Forcier2016-12-052-1/+4
|\ \ \ \ | |/ / /
| * | | Merge branch '1.18' into 2.0Jeff Forcier2016-12-052-1/+4
| |\ \ \ | | |/ /
| | * | Merge branch '1.17' into 1.18Jeff Forcier2016-12-052-1/+4
| | |\ \ | | | |/
| | | * Changelog re #801Jeff Forcier2016-12-051-0/+2
| | | * skip test on windows - no SIGALRM.Gabi Davar2016-12-051-1/+2
* | | | Merge branch '2.0'Jeff Forcier2016-12-053-8/+11
|\ \ \ \ | |/ / /
| * | | Merge branch '1.18' into 2.0Jeff Forcier2016-12-053-8/+11
| |\ \ \ | | |/ /
| | * | Merge branch '1.17' into 1.18Jeff Forcier2016-12-053-8/+11
| | |\ \ | | | |/
| | | * Changelog re #792Jeff Forcier2016-12-051-0/+2
| | | * Update README.rstAlan Yee2016-12-051-2/+2
| | | * Update README.rstAlan Yee2016-12-051-1/+1
| | | * Update demo_server.pyAlan Yee2016-12-051-1/+1
| | | * Update README.rstAlan Yee2016-12-051-5/+6
* | | | Merge branch '2.0'Jeff Forcier2016-12-052-0/+13
|\ \ \ \ | |/ / /
| * | | Merge branch '1.18' into 2.0Jeff Forcier2016-12-052-0/+13
| |\ \ \ | | |/ /
| | * | Merge branch '1.17' into 1.18Jeff Forcier2016-12-052-0/+13
| | |\ \ | | | |/
| | | * Changelog re #789Jeff Forcier2016-12-051-0/+4
| | | * Merge branch '1.17' into proxycommand-closed-fix-789Jeff Forcier2016-12-0516-3044/+216
| | | |\
| | | * | Untested fix re #789proxycommand-closed-fix-789Jeff Forcier2016-07-301-0/+9
* | | | | Merge branch '2.0'Jeff Forcier2016-12-055-2974/+17
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch '1.18' into 2.0Jeff Forcier2016-12-055-2974/+17
| |\ \ \ \ | | |/ / /
| | * | | Changelog re #780 / #799Jeff Forcier2016-12-051-0/+8
| | * | | Add timeout to Transport.start_client()Mark Hirota2016-12-052-4/+9
| | * | | Merge branch '1.17' into 1.18Jeff Forcier2016-12-052-2970/+0
| | |\ \ \ | | | | |/ | | | |/|
| | | * | These are old and crusty and folks who care can find 'em in gitJeff Forcier2016-12-052-2970/+0
* | | | | Merge branch '2.0'Jeff Forcier2016-12-053-19/+34
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch '1.18' into 2.0Jeff Forcier2016-12-056-17/+157
| |\ \ \ \ | | |/ / /
| | * | | Just get rid of the frickin' numbers.Jeff Forcier2016-12-051-16/+16