From: Peter Amstutz <peter.amstutz@curoverse.com>
Date: Mon, 23 Jan 2017 15:29:01 +0000 (-0500)
Subject: Merge branch '10812-log-merge' refs #10812
X-Git-Tag: 1.1.0~457
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/c40389e0f064d4ea379d5f5471116936239a467a?hp=--cc

Merge branch '10812-log-merge' refs #10812
---

c40389e0f064d4ea379d5f5471116936239a467a