[ARVADOS] updated: e7e61999bf577b3ba5308c747dda4a0011516aa7

[git at public.curoverse.com]

Summary of changes:
 services/api/app/models/node.rb             | 7 +++----
 services/api/config/application.default.yml | 7 +++++++
 2 files changed, 10 insertions(+), 4 deletions(-)

       via  e7e61999bf577b3ba5308c747dda4a0011516aa7 (commit)
       via  b988327f1fe531cc0e1f1cde73d2b18c05850548 (commit)
       via  0358074100610abe13cac98b82cbeca4326af986 (commit)
      from  cb41817568900d52d3768a91f703f04696f6b702 (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 e7e61999bf577b3ba5308c747dda4a0011516aa7
Merge: cb41817 b988327
Author: Ward Vandewege <ward at curoverse.com>
Date:   Wed May 6 16:17:49 2015 -0400

    Merge branch '5926-parameterize-max-slots'
    
    closes #5926


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


hooks/post-receive
--