projects / arvados.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1d39873 b19b2bc)
Merge branch '4314-crunch-token-expire' refs #4314 refs #4310
authorPeter Amstutz <peter.amstutz@curoverse.com>
Thu, 6 Nov 2014 22:02:34 +0000 (17:02 -0500)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Thu, 6 Nov 2014 22:02:34 +0000 (17:02 -0500)

Trivial merge