From: Peter Amstutz <peter.amstutz@curoverse.com>
Date: Wed, 9 Aug 2017 19:11:35 +0000 (-0400)
Subject: Merge branch '11925-nodemanager-watchdog-test' refs #11925
X-Git-Tag: 1.1.0~93
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/0413abf93d7ee0cfd10222bf04aa88c4e7460303

Merge branch '11925-nodemanager-watchdog-test' refs #11925

Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz@curoverse.com>
---

0413abf93d7ee0cfd10222bf04aa88c4e7460303