11419: Merge branch 'master' into 11419-text-mode
authorTom Clegg <tclegg@veritasgenetics.com>
Mon, 10 Dec 2018 16:37:40 +0000 (11:37 -0500)
committerTom Clegg <tclegg@veritasgenetics.com>
Mon, 10 Dec 2018 16:37:40 +0000 (11:37 -0500)
commit471ac065323e087f2f844d21d1c39929191eba71
tree6fa25b56b66cc34e195bd90544e3ca22432352d9
parent127e57b8ea812b9d03b67c0118230a475b727158
parenta63b5a0397f8c65ab4777e8e91daf64c9098871b
11419: Merge branch 'master' into 11419-text-mode

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