projects / arvados.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3b3c3a0 829f6ad)
Merge branch '10847-nodemanager-shutdown' refs #10847
authorPeter Amstutz <peter.amstutz@curoverse.com>
Sat, 10 Jun 2017 01:30:29 +0000 (21:30 -0400)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Sat, 10 Jun 2017 01:30:29 +0000 (21:30 -0400)

Trivial merge