[ARVADOS] updated: 2a30f6a162a59ff5a75b9fcdef4913baeeae6a1e

[Git user]

Summary of changes:
 services/api/app/models/user.rb     |  4 ++--
 services/api/test/unit/user_test.rb | 10 ++++++++++
 2 files changed, 12 insertions(+), 2 deletions(-)

       via  2a30f6a162a59ff5a75b9fcdef4913baeeae6a1e (commit)
       via  7f5e5b88c9161cbec69725108e438aa1532acaf5 (commit)
      from  afabb6c30c449d6139aec344d0912fc2645e2e89 (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 2a30f6a162a59ff5a75b9fcdef4913baeeae6a1e
Merge: afabb6c 7f5e5b8
Author: Tom Clegg <tom at curoverse.com>
Date:   Wed Jun 29 15:55:11 2016 -0400

    Merge branch '9518-username-conflict'
    
    closes #9518


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


hooks/post-receive
--