projects / arvados.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 24b1aec ed1acd6)
Merge branch '6520-nodemanager-crunchv2' refs #6520
authorPeter Amstutz <peter.amstutz@curoverse.com>
Thu, 16 Feb 2017 21:44:22 +0000 (16:44 -0500)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Thu, 16 Feb 2017 21:44:36 +0000 (16:44 -0500)
1  2 
services/api/app/models/node.rb patch | diff1 | diff2 | blob | history

diff --cc services/api/app/models/node.rb
Simple merge