12167: Merge branch 'master' into 12167-keep-request-id
authorTom Clegg <tclegg@veritasgenetics.com>
Sat, 25 Nov 2017 07:20:23 +0000 (02:20 -0500)
committerTom Clegg <tclegg@veritasgenetics.com>
Mon, 27 Nov 2017 15:05:03 +0000 (10:05 -0500)
commit03a016b1edff72e698474cd31a887530ea89b530
tree19ae0de6e3a5d279740851c449be6a5ab551fe89
parentb21dbd5c2fec1c8c61d232b2cf7f0a68240d9203
parent49707c44d918ffd1c8f7d90012f9e4fba30c9542
12167: Merge branch 'master' into 12167-keep-request-id

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg@veritasgenetics.com>
services/keepproxy/keepproxy_test.go