12552: Merge branch 'master' into 12552-wf-priority
authorTom Clegg <tclegg@veritasgenetics.com>
Wed, 14 Mar 2018 18:15:15 +0000 (14:15 -0400)
committerTom Clegg <tclegg@veritasgenetics.com>
Wed, 14 Mar 2018 18:15:15 +0000 (14:15 -0400)
commit5b5be8dfac71c7db9d5a966485fa04f24fd20957
tree6c828a66270552fa352c5e2cf1f614a8dbc3bd66
parent4de1b42b8b8538da3e4d16b1692c99824e51eb29
parent5282d5462d86721c73849c2e5f3d057657c74b51
12552: Merge branch 'master' into 12552-wf-priority

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