projects / arvados.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c405873 ebb21c7)
Merge branch 'master' into 9187-crunchv2-dispatching
authorPeter Amstutz <peter.amstutz@curoverse.com>
Mon, 6 Jun 2016 18:46:37 +0000 (14:46 -0400)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Mon, 6 Jun 2016 18:46:37 +0000 (14:46 -0400)

Trivial merge