summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix download pathfix-gaeJon Wayne Parrott2017-05-281-1/+1
* Remove erroneous check, the gcp-devrel script handles in-place upgradesJon Wayne Parrott2017-05-281-1/+1
* Fix GAE buildJon Wayne Parrott2017-05-284-111/+4
* Merge pull request #1185 from Lukasa/fix-docs-buildCory Benfield2017-05-281-0/+1
|\
| * Pin out all unvendored Requests releases for docsCory Benfield2017-05-281-0/+1
|/
* Merge pull request #1170 from tiran/tls13Cory Benfield2017-05-033-1/+11
|\
| * Add TLS 1.3 cipher suitesChristian Heimes2017-05-023-1/+11
|/
* Merge pull request #1169 from Lukasa/release-1.21.1Cory Benfield2017-05-021-3/+8
|\
| * Update changelog for v1.21.1Cory Benfield2017-05-021-3/+8
|/
* Merge pull request #1157 from dims/add-assert-hostname-to-poolmanagerJesse Shapiro2017-05-013-0/+15
|\
| * Add assert_hostname/assert_fingerprint to list of valid keys for PoolManagerDavanum Srinivas2017-04-303-0/+15
|/
* Merge pull request #1161 from Disassem/patch-1Cory Benfield2017-04-281-2/+0
|\
| * Merge branch 'master' into patch-1Cory Benfield2017-04-283-0/+29
| |\ | |/ |/|
* | Merge pull request #1166 from Lukasa/lists-in-pool-keysCory Benfield2017-04-283-0/+29
|\ \
| * | Changes for #1165.Cory Benfield2017-04-281-0/+3
| * | Force socket options to tuple in pool keyCory Benfield2017-04-281-0/+6
| * | Failing test for #1165Cory Benfield2017-04-281-0/+20
|/ /
| * Remove useless lineDisassem2017-04-271-2/+0
|/
* Merge pull request #1159 from Lukasa/changes-1154Cory Benfield2017-04-271-0/+3
|\
| * Changelog entry for #1154Cory Benfield2017-04-271-0/+3
|/
* Merge pull request #1154 from Lukasa/no-buffering-with-securetransportCory Benfield2017-04-271-1/+5
|\
| * Disable buffering when using SecureTransportCory Benfield2017-04-251-1/+5
|/
* Merge pull request #1152 from Lukasa/release-1.21Cory Benfield2017-04-251-0/+11
|\
| * Update CHANGES for 1.21Cory Benfield2017-04-251-0/+11
|/
* Merge pull request #1122 from Lukasa/secure-transportCory Benfield2017-04-2518-18/+1995
|\
| * Merge branch 'master' into secure-transportCory Benfield2017-04-253-2/+9
| |\ | |/ |/|
* | Merge pull request #1150 from Lukasa/appveyor36Cory Benfield2017-04-252-1/+8
|\ \
| * \ Merge branch 'master' into appveyor36Cory Benfield2017-04-241-1/+1
| |\ \ | |/ / |/| |
* | | Merge pull request #1151 from reaperhulk/patch-1Cory Benfield2017-04-241-1/+1
|\ \ \
| * | | Switch to the Travis CI SVG build badge!Paul Kehrer2017-04-241-1/+1
|/ / /
| * | Resolve Windows + Py36 bugCory Benfield2017-04-241-1/+3
| * | Test Python 3.6 on appveyorCory Benfield2017-04-241-0/+5
|/ /
| * Read short on EOFCory Benfield2017-04-251-0/+4
| * Don't error out on short readsCory Benfield2017-04-251-4/+8
| * Ensure we ship the securetransport submoduleCory Benfield2017-04-251-1/+1
| * Make sure we document securetransportCory Benfield2017-04-251-0/+7
| * Add SecureTransport to CHANGESCory Benfield2017-04-241-0/+3
| * Merge branch 'master' into secure-transportCory Benfield2017-04-2119-186/+761
| |\ | |/ |/|
* | Merge pull request #1148 from tuukkamustonen/status-countCory Benfield2017-04-174-8/+39
|\ \
| * | Add 'status' counter for 'status_forcelist'Tuukka Mustonen2017-04-154-8/+39
|/ /
* | Merge pull request #1142 from SethMichaelLarson/patch-2Cory Benfield2017-04-035-7/+38
|\ \
| * | Allow APPVEYOR environment variable in toxSeth M. Larson2017-04-031-1/+1
| * | Add comment about try-catch strategySeth M. Larson2017-04-031-1/+7
| * | except NameError:Seth M. Larson2017-04-031-2/+2
| * | Also skip timing for selector testing on AppVeyor.Seth M. Larson2017-04-011-3/+4
| * | Skip TLS test on Windows py26, fix lint issuesSeth Michael Larson2017-04-014-3/+19
| * | socket.error is not a subclass of OSError in Python 2Seth M. Larson2017-04-011-1/+4
| * | WinError isn't a subclass of OSError <3.3Seth M. Larson2017-03-311-1/+1
| * | Actually use _CONNECT_ERRORSeth M. Larson2017-03-311-1/+1
| * | Use the socketpair helper in WaitForIOTestsSeth M. Larson2017-03-311-1/+1