9918: Merge branch '9918-index-timeout'
authorWard Vandewege <wvandewege@veritasgenetics.com>
Tue, 22 May 2018 13:58:52 +0000 (09:58 -0400)
committerWard Vandewege <wvandewege@veritasgenetics.com>
Tue, 22 May 2018 13:58:52 +0000 (09:58 -0400)
refs #9918

Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <wvandewege@veritasgenetics.com>


Trivial merge