[ARVADOS] updated: 021d36f17fe0329e869324d3764eaaf15c3a0771

[Git user]

Summary of changes:
 .../app/controllers/arvados/v1/users_controller.rb | 12 ++----
 services/api/app/models/user.rb                    | 46 +++++++++++-----------
 .../functional/arvados/v1/users_controller_test.rb | 18 +++++++++
 services/api/test/unit/user_test.rb                | 17 +++++---
 4 files changed, 58 insertions(+), 35 deletions(-)

       via  021d36f17fe0329e869324d3764eaaf15c3a0771 (commit)
       via  eb0012d203974e54023dfcac6e04fd4c2c40270f (commit)
       via  2b62223c9ba420208b9f293825e7f6ae3f50f95b (commit)
       via  28cf4975bf3a72ff11ab4044a54b434857b1b95e (commit)
      from  156f7186528045a58628c58f3b4b48fcb3825cd5 (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 021d36f17fe0329e869324d3764eaaf15c3a0771
Merge: 156f718 eb0012d
Author: Tom Clegg <tom at curoverse.com>
Date:   Thu Jun 15 12:11:13 2017 -0400

    Merge branch '10557-auto-setup'
    
    refs #10557
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curoverse.com>


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


hooks/post-receive
--