From: Peter Amstutz <peter.amstutz@curoverse.com>
Date: Thu, 6 Nov 2014 22:02:34 +0000 (-0500)
Subject: Merge branch '4314-crunch-token-expire' refs #4314 refs #4310
X-Git-Tag: 1.1.0~2024
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/a0ff04290d85b5608211b1fd3ccb00c2e0758503

Merge branch '4314-crunch-token-expire' refs #4314 refs #4310
---

a0ff04290d85b5608211b1fd3ccb00c2e0758503