projects / arvados.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5220b3d 47fef38)
Merge branch '15044-test-fixes'
authorTom Clegg <tclegg@veritasgenetics.com>
Tue, 2 Apr 2019 17:28:10 +0000 (13:28 -0400)
committerTom Clegg <tclegg@veritasgenetics.com>
Tue, 2 Apr 2019 17:28:10 +0000 (13:28 -0400)
closes #15044

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg@veritasgenetics.com>

1  2 
services/keepproxy/keepproxy.go patch | diff1 | diff2 | blob | history

diff --cc services/keepproxy/keepproxy.go
Simple merge