summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Cut 2.4.22.4.2Jeff Forcier2018-09-182-1/+2
* Merge branch '2.3' into 2.4Jeff Forcier2018-09-181-4/+7
|\
| * Cut 2.3.32.3.3Jeff Forcier2018-09-182-1/+2
| * Merge branch '2.2' into 2.3Jeff Forcier2018-09-181-0/+1
| |\
| | * Cut 2.2.42.2.4Jeff Forcier2018-09-182-1/+2
| * | Merge branch '2.2' into 2.3Jeff Forcier2018-09-181-4/+5
| |\ \ | | |/
| | * Merge branch '2.1' into 2.2Jeff Forcier2018-09-181-4/+5
| | |\
| | | * Cut 2.1.62.1.6Jeff Forcier2018-09-182-1/+2
| | | * Merge branch '2.0' into 2.1Jeff Forcier2018-09-181-4/+4
| | | |\
| | | | * Cut 2.0.92.0.9Jeff Forcier2018-09-182-1/+2
| | | | * Almost left the 1.17+ marker in the changelog.Jeff Forcier2018-09-181-4/+3
* | | | | Merge branch '2.3' into 2.4Jeff Forcier2018-09-180-0/+0
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch '2.2' into 2.3Jeff Forcier2018-09-181-1/+1
| |\ \ \ \ | | |/ / /
| | * | | Merge branch '2.1' into 2.2Jeff Forcier2018-09-181-1/+1
| | |\ \ \ | | | |/ /
| | | * | Merge branch '2.0' into 2.1Jeff Forcier2018-09-181-1/+1
| | | |\ \ | | | | |/
| | | | * Fix a Python 2.6 oopsJeff Forcier2018-09-181-1/+1
* | | | | Merge branch '2.3' into 2.4Jeff Forcier2018-09-181-5/+3
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch '2.2' into 2.3Jeff Forcier2018-09-181-5/+3
| |\ \ \ \ | | |/ / /
| | * | | Merge branch '2.1' into 2.2Jeff Forcier2018-09-181-5/+3
| | |\ \ \ | | | |/ /
| | | * | Merge branch '2.0' into 2.1Jeff Forcier2018-09-181-5/+3
| | | |\ \ | | | | |/
| | | | * FormattingJeff Forcier2018-09-181-5/+3
* | | | | Merge branch '2.3' into 2.4Jeff Forcier2018-09-185-11/+143
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch '2.2' into 2.3Jeff Forcier2018-09-185-10/+143
| |\ \ \ \ | | |/ / /
| | * | | Merge branch '2.1' into 2.2Jeff Forcier2018-09-185-10/+143
| | |\ \ \ | | | |/ /
| | | * | Merge branch '2.0' into 2.1Jeff Forcier2018-09-185-10/+143
| | | |\ \ | | | | |/
| | | | * Fix and changelog re #1283Jeff Forcier2018-09-183-5/+94
| | | | * Fix a pseudo-bug re: responding to MSG_UNIMPLEMENTED w/ itselfJeff Forcier2018-09-184-5/+49
* | | | | Merge branch '2.3' into 2.4Jeff Forcier2018-09-181-0/+13
|\ \ \ \ \ | |/ / / /
| * | | | Pseudo-merge travis-CI changes re #1292 from 2.2 branchJeff Forcier2018-09-181-0/+13
* | | | | Merge branch '2.3' into 2.4Jeff Forcier2018-09-181-0/+18
|\ \ \ \ \ | |/ / / /
| * | | | Pull in changelog re #1292Jeff Forcier2018-09-181-0/+14
| * | | | Merge branch '2.2' into 2.3Jeff Forcier2018-09-180-0/+0
| |\ \ \ \ | | |/ / /
| | * | | Merge branch '2.1' into 2.2Jeff Forcier2018-09-185-23/+80
| | |\ \ \ | | | |/ /
| | | * | Merge branch '2.0' into 2.1Jeff Forcier2018-09-185-23/+80
| | | |\ \ | | | | |/
| | | | * Merge branch 'crypto-1.5-agnostisicm' into 2.0Jeff Forcier2018-09-185-22/+79
| | | | |\
| | | | | * Backport support for newer cryptography sign/verify APIs.crypto-1.5-agnostisicmJeff Forcier2018-09-184-22/+61
| | | | | * Try testing against different cryptography.io versionsJeff Forcier2018-09-181-0/+18
| | | | * | Missing verbose/color for 2.6/3.3 backported pytest setupJeff Forcier2018-09-181-1/+1
| | | | |/
* | | | | Stars to dashes, 2.4 editionJeff Forcier2018-09-181-277/+277
* | | | | Minor cleanupJeff Forcier2018-09-172-3/+1
* | | | | Merge branch '2.3' into 2.4Jeff Forcier2018-09-170-0/+0
|\ \ \ \ \ | |/ / / /
| * | | | Blacken, 2.3 editionJeff Forcier2018-09-1712-81/+107
| * | | | s/test_path/_support/gJeff Forcier2018-09-172-7/+7
| * | | | Merge branch '2.2' into 2.3Jeff Forcier2018-09-1787-4214/+5210
| |\ \ \ \ | | |/ / /
| | * | | Blacken, 2.2 editionJeff Forcier2018-09-1718-106/+168
| | * | | Test-level fixes for pytest & friends, 2.2 editionJeff Forcier2018-09-173-15/+16
| | * | | Missed a spotJeff Forcier2018-09-171-6/+0
| | * | | Merge branch '2.1' into 2.2Jeff Forcier2018-09-1785-4134/+5112
| | |\ \ \ | | | |/ /
| | | * | One change overlooked by merge, as it's newJeff Forcier2018-09-171-1/+1
| | | * | Blacken 2.1 branchJeff Forcier2018-09-173-32/+37
View Lorry Controller Status