[ARVADOS] updated: 7e54f217895d2f401563c54704c73a196e2d236d

[Git user]

Summary of changes:
 .../app/controllers/user_sessions_controller.rb    |  3 ++
 services/api/app/models/user.rb                    | 36 ++++++++++++----------
 services/api/lib/josh_id.rb                        |  1 +
 .../api/test/integration/user_sessions_test.rb     | 21 ++++++++++---
 4 files changed, 40 insertions(+), 21 deletions(-)

       via  7e54f217895d2f401563c54704c73a196e2d236d (commit)
       via  8ffceeb0bddd457cee62586d405afd8e082e1d6f (commit)
       via  360d5f885a6613a506e283ff74b18382249cf929 (commit)
      from  81d1a618e724c6e9f20f4efa47acbcef4bba5f15 (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 7e54f217895d2f401563c54704c73a196e2d236d
Merge: 81d1a61 8ffceeb
Author: Tom Clegg <tom at curoverse.com>
Date:   Thu Oct 20 06:01:43 2016 -0400

    Merge branch '10287-sso-username' refs #10287


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


hooks/post-receive
--