12167: Merge branch 'master'
authorTom Clegg <tclegg@veritasgenetics.com>
Thu, 3 May 2018 14:10:11 +0000 (10:10 -0400)
committerTom Clegg <tclegg@veritasgenetics.com>
Thu, 3 May 2018 14:10:11 +0000 (10:10 -0400)
commit3e1c43866e5b523c3f1d273c25942ad56dc66d3f
treee447c6ba62214bd498d30d2ba9ea29e34f10c9b6
parent7d96319e476c866f33f119dddd534fa6cbe482fb
parentdc0dae1ac6d799841dffb828a468a062a4935cc4
12167: Merge branch 'master'

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg@veritasgenetics.com>
services/keep-web/handler.go
services/keep-web/handler_test.go