[ARVADOS] updated: 1.1.2-42-g3cca12f

[Git user]

Summary of changes:
 doc/api/methods/users.html.textile.liquid          | 13 ++++
 .../app/controllers/arvados/v1/users_controller.rb | 17 ++++-
 services/api/app/models/user.rb                    | 26 +++++++
 services/api/config/routes.rb                      |  1 +
 .../test/fixtures/api_client_authorizations.yml    |  8 +--
 services/api/test/fixtures/containers.yml          |  3 +-
 .../functional/arvados/v1/users_controller_test.rb | 21 ++++++
 services/api/test/unit/container_test.rb           |  2 +-
 services/api/test/unit/user_test.rb                | 79 ++++++++++++++++++++++
 9 files changed, 162 insertions(+), 8 deletions(-)

       via  3cca12f9fb5452831a826964656f48e427d8edcd (commit)
       via  b5a8d7052ff461073496627aef8e2e0c29901a19 (commit)
       via  680ffd64dac92aec8ad94454334db9ae69b95b56 (commit)
       via  086b27a27c844178ee52a9c4186d970689147628 (commit)
       via  87647b5d3d72ae0c291fcdf1ee3b4a46b3af91c0 (commit)
      from  9f842eecf59f293fd800ece28be2730ff3a39487 (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 3cca12f9fb5452831a826964656f48e427d8edcd
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date:   Tue Jan 9 10:55:25 2018 -0500

    Fix duplicated auth_uuid in container test fixtures.
    
    Fixes flaky test.
    
    No issue #.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>

diff --git a/services/api/test/fixtures/api_client_authorizations.yml b/services/api/test/fixtures/api_client_authorizations.yml
index 8b283db..8d9fc53 100644
--- a/services/api/test/fixtures/api_client_authorizations.yml
+++ b/services/api/test/fixtures/api_client_authorizations.yml
@@ -300,14 +300,14 @@ running_container_auth:
   uuid: zzzzz-gj3su-077z32aux8dg2s2
   api_client: untrusted
   user: active
-  api_token: 3kg6k6lzmp9kj6bpkcoxie963cmvjahbt2fod9zru30k1jqdmi
+  api_token: it2gl94mgu3rbn5s2d06vzh73ns1y6cthct0tvg82qdlsxvbwk
   expires_at: 2038-01-01 00:00:00
 
-not_running_container_auth:
-  uuid: zzzzz-gj3su-077z32aux8dg2s3
+running_to_be_deleted_container_auth:
+  uuid: zzzzz-gj3su-ty6lvu9d7u7c2sq
   api_client: untrusted
   user: active
-  api_token: 4kg6k6lzmp9kj6bpkcoxie963cmvjahbt2fod9zru30k1jqdmj
+  api_token: ge1pez7dkk7nqntwcsj922g2b7a2t27xz6nsx39r15kbcqmp55
   expires_at: 2038-01-01 00:00:00
 
 permission_perftest:
diff --git a/services/api/test/fixtures/containers.yml b/services/api/test/fixtures/containers.yml
index 7e2de6d..3995791 100644
--- a/services/api/test/fixtures/containers.yml
+++ b/services/api/test/fixtures/containers.yml
@@ -145,7 +145,6 @@ requester_container:
   runtime_constraints:
     ram: 12000000000
     vcpus: 4
-  auth_uuid: zzzzz-gj3su-077z32aux8dg2s3
 
 failed_container:
   uuid: zzzzz-dz642-failedcontainr1
@@ -232,4 +231,4 @@ running_to_be_deleted:
   runtime_constraints:
     ram: 12000000000
     vcpus: 4
-  auth_uuid: zzzzz-gj3su-077z32aux8dg2s2
+  auth_uuid: zzzzz-gj3su-ty6lvu9d7u7c2sq
diff --git a/services/api/test/unit/container_test.rb b/services/api/test/unit/container_test.rb
index 3e2b8c1..ed86bef 100644
--- a/services/api/test/unit/container_test.rb
+++ b/services/api/test/unit/container_test.rb
@@ -584,7 +584,7 @@ class ContainerTest < ActiveSupport::TestCase
     c.lock
     c.update_attributes! state: Container::Running
 
-    set_user_from_auth :not_running_container_auth
+    set_user_from_auth :running_to_be_deleted_container_auth
     assert_raises ArvadosModel::PermissionDeniedError do
       c.update_attributes! output: collections(:foo_file).portable_data_hash
     end

commit b5a8d7052ff461073496627aef8e2e0c29901a19
Merge: 9f842ee 680ffd6
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date:   Tue Jan 9 10:54:50 2018 -0500

    Merge branch '12702-migrate-user'
    
    closes #12702
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>


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


hooks/post-receive
--