summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* v2.4.0 changelogv2.4.0Kenneth Reitz2014-08-291-3/+14
* Revert "Documentation update : connection keep alive"Kenneth Reitz2014-08-291-4/+0
* 3.4 classifierKenneth Reitz2014-08-281-0/+1
* keep-aliveKenneth Reitz2014-08-281-1/+2
* v2.4.0Kenneth Reitz2014-08-281-2/+2
* Merge pull request #2178 from sigmavirus24/env-retrievalKenneth Reitz2014-08-261-24/+28
|\
| * Update verify check and doc-stringIan Cordasco2014-08-261-7/+5
| * Add Session method to merge environment settings with per-request settingsIan Cordasco2014-08-261-24/+30
* | Merge pull request #2183 from Lukasa/docupdateKenneth Reitz2014-08-261-1/+1
|\ \ | |/ |/|
| * Remove timeline.json from docs.Cory Benfield2014-08-261-1/+1
|/
* Merge pull request #2174 from kevinburke/test-clarificationKenneth Reitz2014-08-261-1/+3
|\
| * clarify commentKevin Burke2014-08-231-1/+1
| * Clarify which tests to run in the MakefileKevin Burke2014-08-231-1/+3
* | Merge pull request #2176 from kevinburke/connectKenneth Reitz2014-08-266-13/+130
|\ \
| * | woopsKevin Burke2014-08-241-3/+2
| * | assert connect timeout inheritanceKevin Burke2014-08-241-2/+4
| * | ConnectTimeout multiple inheritanceKevin Burke2014-08-241-2/+2
| * | revert changeKevin Burke2014-08-241-1/+1
| * | Add support for connect timeoutsKevin Burke2014-08-236-14/+130
| |/
* | Merge pull request #2179 from kevinburke/urllib3-pypy-sslKenneth Reitz2014-08-268-24/+100
|\ \ | |/ |/|
| * Updates urllib3 to 528ad3cKevin Burke2014-08-258-24/+100
|/
* Merge pull request #2172 from ContinuousFunction/masterKenneth Reitz2014-08-222-2/+3
|\
| * Adding my name to authorsContinuousFunction2014-08-211-1/+1
| * Adding myself to authors.ContinuousFunction2014-08-211-1/+1
| * Adding my name to authors.ContinuousFunction2014-08-211-0/+1
| * Added space and sentence caseContinuousFunction2014-08-211-2/+2
* | Cleanup grammar from previous commit.Cory Benfield2014-08-221-3/+4
* | Merge pull request #2173 from tychotatitscheff/masterCory Benfield2014-08-221-0/+3
|\ \
| * | Documentation update : connection keep alivetat36572014-08-221-0/+3
|/ /
* | Merge pull request #2168 from ContinuousFunction/masterKenneth Reitz2014-08-212-0/+16
|\ \ | |/
| * Update on Tracking Previous RequestsContinuousFunction2014-08-192-4/+5
| * Tracking Previous RequestsContinuousFunction2014-08-172-0/+15
* | 21mKenneth Reitz2014-08-191-1/+1
|/
* Merge pull request #2153 from jschneier/masterKenneth Reitz2014-08-013-19/+5
|\
| * handle urllib3 api changes; closes #2045Josh Schneier2014-07-293-19/+5
|/
* Merge pull request #2148 from romanlevin/handle-socket-error-in-iter_contentKenneth Reitz2014-07-272-2/+17
|\
| * Replace setattrRoman Levin2014-07-241-1/+1
| * Handle socket errors in iter_contentRoman Levin2014-07-242-2/+17
|/
* Merge pull request #2142 from sigmavirus24/urllib3-1.9Kenneth Reitz2014-07-2221-544/+818
|\
| * Fix test bug courtesy of @shazowIan Cordasco2014-07-211-1/+2
| * Upgrade urllib3 to 1.9.xIan Cordasco2014-07-2120-543/+816
* | Merge pull request #2145 from TkTech/patch-1Kenneth Reitz2014-07-221-3/+4
|\ \
| * | Update faq.rstTyler Kennedy2014-07-221-3/+4
| * | Update faq.rstTyler Kennedy2014-07-221-1/+1
|/ /
* | Merge pull request #2140 from dpursehouse/linkify-usernamesCory Benfield2014-07-221-30/+30
|\ \
| * | Add links to Twitter accountsDavid Pursehouse2014-07-181-2/+2
| * | Linkify Github usernames in authors listDavid Pursehouse2014-07-181-30/+30
* | | Merge pull request #2141 from esparta/masterCory Benfield2014-07-182-19/+19
|\ \ \
| * | | Docs: Using print() function instead print command on advanced & quickstart u...Espartaco Palma2014-07-182-19/+19
|/ / /
* | | Merge pull request #2139 from dpursehouse/line-wrappingCory Benfield2014-07-182-14/+38
|\ \ \ | |/ / |/| |