projects / arvados.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5e75d51 c934e8a)
Merge branch 'master' into 9161-node-state-fixes
authorPeter Amstutz <peter.amstutz@curoverse.com>
Tue, 17 May 2016 12:50:51 +0000 (08:50 -0400)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Tue, 17 May 2016 12:50:51 +0000 (08:50 -0400)

Trivial merge