From: Peter Amstutz <peter.amstutz@curoverse.com>
Date: Wed, 1 Oct 2014 19:23:23 +0000 (-0400)
Subject: Merge branch '3052-crunch-log-stdout' into 3769-throttle-logs
X-Git-Tag: 1.1.0~2137^2~4
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/e910d13fc5fc63a86f20be3b758c08db3d429bc6?ds=sidebyside;hp=--cc

Merge branch '3052-crunch-log-stdout' into 3769-throttle-logs
---

e910d13fc5fc63a86f20be3b758c08db3d429bc6