12933: Merge branch 'master' into 12933-log-node-properties
authorTom Clegg <tclegg@veritasgenetics.com>
Thu, 11 Jan 2018 16:50:13 +0000 (11:50 -0500)
committerTom Clegg <tclegg@veritasgenetics.com>
Thu, 11 Jan 2018 16:50:13 +0000 (11:50 -0500)
commitcf849fa29c00bf46d7bd5712c00763632f4daecd
tree0d48bb250e2d48217e2498636c40284132ce323d
parent5469772c43759b8bde77c3d78450658e266b9cf0
parent79309a1e149b8d3e62810a32769de30e71be7688
12933: Merge branch 'master' into 12933-log-node-properties

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