From: Tom Clegg <tom@curoverse.com>
Date: Thu, 13 Jul 2017 19:33:53 +0000 (-0400)
Subject: Merge branch '11968-ws-startup-crash'
X-Git-Tag: 1.1.0~135
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/b8977c89db2707dd713cd4eeb11d595717fcff75

Merge branch '11968-ws-startup-crash'

closes #11968

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curoverse.com>
---

b8977c89db2707dd713cd4eeb11d595717fcff75