[ARVADOS] updated: 3860042ac5783cddd368d8997991b0d1f8e9a111

[Git user]

Summary of changes:
 services/api/app/models/node.rb     | 28 +++++++++++++---------------
 services/api/test/unit/node_test.rb | 27 +++++++++++++++++++++++++++
 2 files changed, 40 insertions(+), 15 deletions(-)

       via  3860042ac5783cddd368d8997991b0d1f8e9a111 (commit)
       via  ecd8381224f7883db0504eb338d7f1c55fc4349f (commit)
      from  7a53cfc92d4bca452a687db0a6f338e6deb1564a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 3860042ac5783cddd368d8997991b0d1f8e9a111
Merge: 7a53cfc ecd8381
Author: Tom Clegg <tom at curoverse.com>
Date:   Tue Jan 31 10:52:29 2017 -0500

    Merge branch '10868-ip-addr-conflict'
    
    refs #10868


-----------------------------------------------------------------------


hooks/post-receive
--