Merge branch '11968-ws-startup-crash'
authorTom Clegg <tom@curoverse.com>
Thu, 13 Jul 2017 19:33:53 +0000 (15:33 -0400)
committerTom Clegg <tom@curoverse.com>
Thu, 13 Jul 2017 19:33:53 +0000 (15:33 -0400)
commitb8977c89db2707dd713cd4eeb11d595717fcff75
tree6384e0b5edc544260467f52971e18d5be1f4ff90
parenta95c9948e04eab66cbb3aa4e93776c52956fc807
parentbd29cfa5cdba4365faef20003e8856946b7b928c
Merge branch '11968-ws-startup-crash'

closes #11968

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