From: Peter Amstutz <peter.amstutz@curoverse.com>
Date: Wed, 25 May 2016 20:30:10 +0000 (-0400)
Subject: Merge branch '9303-kill-nodemanager-on-dead-actor' refs #9303
X-Git-Tag: 1.1.0~927
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/22fb8112e4a66280669cc84a44550172b5a438e7

Merge branch '9303-kill-nodemanager-on-dead-actor' refs #9303
---

22fb8112e4a66280669cc84a44550172b5a438e7