projects / arvados.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 139728c f0d8ab5)
Merge branch 'master' into 2880-crunch-dispatch-node-constraints-wip 2880-crunch-dispatch-node-constraints-wip
authorBrett Smith <brett@curoverse.com>
Mon, 9 Jun 2014 19:13:43 +0000 (15:13 -0400)
committerBrett Smith <brett@curoverse.com>
Mon, 9 Jun 2014 19:13:43 +0000 (15:13 -0400)

Trivial merge