projects / arvados.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: 4f1085f 4a72800)
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)
Fixing broken rebase


Trivial merge