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)
commit3fa4a2b6138e3e9e468dd885a743ca38f08f0755
treede4618ece0a0b9b0abd16d3c7abd7a3987623be3
parent24b1aecb485b170c6e127251201a6bac87d7860a
parented1acd6fd780467ba69998e76e28fda61beedc0f
Merge branch '6520-nodemanager-crunchv2' refs #6520
services/api/app/models/node.rb