13025: Merge branch 'master' into 13025-keepstore-metrics
authorTom Clegg <tclegg@veritasgenetics.com>
Mon, 12 Feb 2018 19:53:50 +0000 (14:53 -0500)
committerTom Clegg <tclegg@veritasgenetics.com>
Mon, 12 Feb 2018 19:53:50 +0000 (14:53 -0500)
commit3826a6339ba1c901c054053920ed20547b3ba54d
treee87dfcabf370efc49650918a23a1f8329607b864
parentc93eb8717c79922f3e68b13405b5250bb1345d72
parentc0a5fa033d0a9bfbeab001f287969756e9e1d16d
13025: Merge branch 'master' into 13025-keepstore-metrics

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