projects
/
arvados.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
c792e49
1a18a29
)
Merge branch '15286-fixes'
author
Ward Vandewege <wvandewege@veritasgenetics.com>
Mon, 3 Jun 2019 20:51:19 +0000
(16:51 -0400)
committer
Ward Vandewege <wvandewege@veritasgenetics.com>
Mon, 3 Jun 2019 20:55:38 +0000
(16:55 -0400)
Fixes from the 1.4 branch.
refs #15286
Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <wvandewege@veritasgenetics.com>
Trivial merge