From: Tim Pierce Date: Fri, 13 Jun 2014 14:39:00 +0000 (-0400) Subject: Merge branch '2934-limit-crunch-logs' of git.curoverse.com:arvados into 2934-limit... X-Git-Tag: 1.1.0~2548^2~6 X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/0dffc025de9ebc7a54596e1018a589a6f5b8a03e Merge branch '2934-limit-crunch-logs' of git.curoverse.com:arvados into 2934-limit-crunch-logs Fixing broken rebase --- 0dffc025de9ebc7a54596e1018a589a6f5b8a03e