Merge branch '2934-limit-crunch-logs' of git.curoverse.com:arvados into 2934-limit...
authorTim Pierce <twp@curoverse.com>
Fri, 13 Jun 2014 14:39:00 +0000 (10:39 -0400)
committerTim Pierce <twp@curoverse.com>
Fri, 13 Jun 2014 14:39:00 +0000 (10:39 -0400)
commit0dffc025de9ebc7a54596e1018a589a6f5b8a03e
treea90ea775262a11d2c1a63509695be95f060866bc
parent4f1085f353d44600643a8e9dd6b43a39131e7946
parent4a72800f68ab43d2ed50895fa4ce83e512b4719b
Merge branch '2934-limit-crunch-logs' of git.curoverse.com:arvados into 2934-limit-crunch-logs

Fixing broken rebase