summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Cut 2.2.32.2.3Jeff Forcier2018-03-122-1/+2
* Merge branch '2.1' into 2.2Jeff Forcier2018-03-121-0/+2
|\
| * Cut 2.1.52.1.5Jeff Forcier2018-03-122-1/+2
| * Merge branch '2.0' into 2.1Jeff Forcier2018-03-121-0/+1
| |\
| | * Cut 2.0.82.0.8Jeff Forcier2018-03-122-1/+2
* | | Merge branch '2.1' into 2.2Jeff Forcier2018-03-121-4/+4
|\ \ \ | |/ /
| * | Merge branch '2.0' into 2.1Jeff Forcier2018-03-121-4/+4
| |\ \ | | |/
| | * flake8Jeff Forcier2018-03-121-4/+4
* | | Merge branch '2.1' into 2.2Jeff Forcier2018-03-121-0/+4
|\ \ \ | |/ /
| * | Merge branch '2.0' into 2.1Jeff Forcier2018-03-121-0/+4
| |\ \ | | |/
| | * Screen off dev version of Python from test matrixJeff Forcier2018-03-121-0/+4
| | * Fixes CVE-2018-7750 / #1175Jeff Forcier2018-03-122-2/+44
* | | Merge branch '2.1' into 2.2Jeff Forcier2018-03-121-0/+5
|\ \ \ | |/ /
| * | Merge branch '2.0' into 2.1Jeff Forcier2018-03-121-0/+5
| |\ \ | | |/
| | * Changelog closes #1175Jeff Forcier2018-03-121-0/+5
* | | Merge branch '2.1' into 2.2Jeff Forcier2018-03-120-0/+0
|\ \ \ | |/ /
| * | Merge branch '2.0' into 2.1Jeff Forcier2018-03-120-0/+0
| |\ \ | | |/
| | * Initial tests proving CVE-2018-7750 / #1175Jeff Forcier2018-03-121-2/+40
| | * Allow overriding test client connect kwargs in Transport test suiteJeff Forcier2018-03-121-3/+10
* | | Merge branch '2.1' into 2.2Jeff Forcier2018-03-123-7/+94
|\ \ \ | |/ /
| * | Merge branch '2.0' into 2.1Jeff Forcier2018-03-123-7/+94
| |\ \
| | * | Fixes CVE-2018-7750 / #XXXJeff Forcier2018-03-122-2/+44
| | * | Initial tests proving CVE-2018-7750 / #XXXJeff Forcier2018-03-121-2/+40
| | * | Allow overriding test client connect kwargs in Transport test suiteJeff Forcier2018-03-121-3/+10
| | |/
* | | Test proving #1039 / efficacy of #1051Jeff Forcier2017-11-291-0/+10
* | | Merge branch '2.2' into 1051-intJeff Forcier2017-11-2917-131/+367
|\ \ \
| * \ \ Merge branch '2.1' into 2.2Jeff Forcier2017-11-071-1/+0
| |\ \ \ | | |/ /
| | * | Merge branch '2.0' into 2.1Jeff Forcier2017-11-071-1/+0
| | |\ \ | | | |/
| | | * OK this is good now, with the setuptools pinJeff Forcier2017-11-071-1/+0
| * | | Merge branch '2.1' into 2.2Jeff Forcier2017-11-071-1/+2
| |\ \ \ | | |/ /
| | * | Merge branch '2.0' into 2.1Jeff Forcier2017-11-071-1/+2
| | |\ \ | | | |/
| | | * Well let's try latest setuptools, I guess.Jeff Forcier2017-11-071-1/+1
| | | * Despite odd output, pip 9.0.1 is installing; so how old's our setuptools?Jeff Forcier2017-11-071-1/+1
| | | * Uh...output claims pip somehow installing 7.x???Jeff Forcier2017-11-071-0/+1
| * | | Merge branch '2.1' into 2.2Jeff Forcier2017-11-071-0/+2
| |\ \ \ | | |/ /
| | * | Merge branch '2.0' into 2.1Jeff Forcier2017-11-071-0/+2
| | |\ \ | | | |/
| | | * JeezJeff Forcier2017-11-071-0/+2
| * | | Merge branch '2.1' into 2.2Jeff Forcier2017-11-071-3/+3
| |\ \ \ | | |/ /
| | * | Merge branch '2.0' into 2.1Jeff Forcier2017-11-071-3/+3
| | |\ \ | | | |/
| | | * Limit dev-requirements to python 2.6 compat versions.Jeff Forcier2017-11-071-3/+3
| * | | Merge branch '2.1' into 2.2Jeff Forcier2017-11-071-0/+1
| |\ \ \ | | |/ /
| | * | Merge branch '2.0' into 2.1Jeff Forcier2017-11-071-0/+1
| | |\ \ | | | |/
| | | * Add Python 3.7-dev to Travis matrix. Why not?Jeff Forcier2017-11-071-0/+1
| * | | Merge branch '2.1' into 2.2Jeff Forcier2017-11-072-4/+7
| |\ \ \ | | |/ /
| | * | Merge branch '2.0' into 2.1Jeff Forcier2017-11-072-4/+7
| | |\ \ | | | |/
| | | * Changelog re #1108Jeff Forcier2017-11-071-0/+3
| | | * Rename an internal-only 'async' method kwarg for Python 3.7 compatibility.Jeff Forcier2017-11-071-4/+4
| * | | Merge branch '2.1' into 2.2Jeff Forcier2017-10-182-0/+4
| |\ \ \ | | |/ /
| | * | Merge branch '2.0' into 2.1Jeff Forcier2017-10-182-0/+4
| | |\ \ | | | |/
| | | * Include LICENSE in wheelsJeff Forcier2017-10-182-0/+4