From: Tom Clegg <tom@curoverse.com>
Date: Tue, 7 Mar 2017 20:39:36 +0000 (-0500)
Subject: Merge branch '3115-keep-disk-create-surprise'
X-Git-Tag: 1.1.0~386
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/533a50bbcee4ece451a65e87066563a5b33ef150

Merge branch '3115-keep-disk-create-surprise'

closes #3115
---

533a50bbcee4ece451a65e87066563a5b33ef150