[ARVADOS] updated: 48dd255814cfc90a095132b6f621af13430267e0

[git at public.curoverse.com]

Summary of changes:
 .../app/controllers/actions_controller.rb          | 10 +++
 apps/workbench/app/views/layouts/body.html.erb     |  2 +-
 .../test/controllers/actions_controller_test.rb    | 39 ++++++++++
 .../test/controllers/projects_controller_test.rb   | 10 +++
 .../test/integration/user_settings_menu_test.rb    |  3 +-
 doc/_includes/_ssh_addkey.liquid                   |  4 +-
 doc/install/install-api-server.html.textile.liquid | 32 ++++++---
 .../install-compute-node.html.textile.liquid       |  4 +-
 .../install-crunch-dispatch.html.textile.liquid    | 40 ++++++++++-
 doc/install/install-sso.html.textile.liquid        | 79 +++++++++++++++-----
 .../install-workbench-app.html.textile.liquid      | 23 +++---
 .../vm-login-with-webshell.html.textile.liquid     |  4 +-
 doc/user/reference/api-tokens.html.textile.liquid  |  4 +-
 doc/user/topics/arv-copy.html.textile.liquid       |  2 +-
 .../add-new-repository.html.textile.liquid         |  6 +-
 .../tutorial-submit-job.html.textile.liquid        |  6 +-
 services/api/script/crunch-dispatch.rb             |  6 ++
 services/datamanager/datamanager.go                | 44 ++++++++----
 services/datamanager/keep/keep.go                  | 84 ++++++++++++++++++++--
 services/datamanager/keep/keep_test.go             | 81 +++++++++++++++++++++
 services/datamanager/summary/pull_list.go          |  6 +-
 services/datamanager/summary/pull_list_test.go     | 81 ++++++++++-----------
 services/datamanager/summary/trash_list.go         | 60 ++++++++++++++++
 services/datamanager/summary/trash_list_test.go    | 76 ++++++++++++++++++++
 services/keepstore/trash_worker.go                 |  8 ++-
 25 files changed, 587 insertions(+), 127 deletions(-)
 create mode 100644 services/datamanager/keep/keep_test.go
 create mode 100644 services/datamanager/summary/trash_list.go
 create mode 100644 services/datamanager/summary/trash_list_test.go

       via  48dd255814cfc90a095132b6f621af13430267e0 (commit)
       via  baccfce65b0c997202c22e36a2ebfc455eff0334 (commit)
       via  5f3ac75bd946f743ca40ebf454dc29900cddfefb (commit)
       via  e0a1fc70f919741a8ad840dc40cfcc87f2751722 (commit)
       via  e9bee65d40255ab7aced5d380c546068c604bc38 (commit)
       via  68481a07e385c86a03b9c963adc9be091373a78a (commit)
       via  b369dfc85a356371e1bfb1eb1c3ddb8e8eaffc3d (commit)
       via  6e65fde6143673c27ba85fef16acb1f5dce2d5b9 (commit)
       via  3ba1af7f304edf32aea7250f569e5348f2af501e (commit)
       via  f2f4727cf8a91e363c2a1c85e98fcdd6419abdb5 (commit)
       via  44184f3bebe52f3d4ea567b8105f3631fcb003fe (commit)
       via  5b2e3d9c92b34603912872c2e10e13da91268a29 (commit)
       via  e32890977964e1c14169962edeba4f642e4e1091 (commit)
       via  9fcd7e96ad9ed8c7f3a343663a06ee9cbaa15aa9 (commit)
       via  b958c247cba0cc0a9b13dfd4fbc10c1a807b5074 (commit)
       via  5f708f621d43585e59787d86d4e3565e09f9c6b8 (commit)
       via  80abb8a0e679f4dd1a7ac00cd629f854af160de5 (commit)
       via  b3a25028eaf04bf77e1f0665968527a9084a84dc (commit)
       via  15c86f88f1f5124c082e77dedd0b97c5efc93388 (commit)
       via  95135f30f13fe233da5d8713737561f77a97c6b6 (commit)
       via  434be0f7e6420fee1b99e78466ee4a4d734734c1 (commit)
       via  b6f800ae7e474f1ceeb827fc9712296a96514592 (commit)
       via  b5b88cdaefb4f35b877c3279d6556fae7d62afcf (commit)
       via  a812a13a6e9854f37ecebccedeb163b8cbe7130e (commit)
       via  93655055b823716a4e45abc4f35f6ba06920e11b (commit)
       via  d44692dedcf0af87f53653afc27154c38a7b72a5 (commit)
       via  4d6e05c25c6a5d72afee37f8165b006267b4183d (commit)
       via  e8ba9a0432ab7a304bb4b41eb563443f34cf2d7d (commit)
       via  fe7f9a43e42f31c35d879aee3e0ec5f811b19abf (commit)
       via  6870192ada3c34ffe5f0dc4c33ce2ad55bc2d263 (commit)
       via  d2cbbe5a55cec8e6a874ea65acec7bf36c8c0a83 (commit)
       via  8d2aebfd3a0e4814b292659710386f949cafe092 (commit)
       via  60f3ef78fe5dc269b2c06d980cc95cbc4f8fdd84 (commit)
       via  9b3223e5cbcd1eb89193e8421d430025ddf791d1 (commit)
       via  1e6134579d0fd7f548a9340b67709d4731b29934 (commit)
       via  50419ea603e697dd53690842a07a279577d1ca68 (commit)
       via  91b7b7fd54c4728ac6cf12181efc1fed60157ecb (commit)
       via  f51b562b9def7f6bc17e0cc52b60ffc2641d40b5 (commit)
       via  f63e86a3270836ab5e5f1de31e28b686ff809739 (commit)
       via  7da85b85af2dd9b22186bfd48190de7b68f75837 (commit)
       via  036140f305fc34fdefe0ae393b1011f4c3f840de (commit)
       via  b0b276ff6121aace3c52ee855752df6852120343 (commit)
       via  2578d032288f24988a54ee57708fe71902e4ef92 (commit)
      from  bdabb9aa520b598107e319e51638f899f136aff5 (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 48dd255814cfc90a095132b6f621af13430267e0
Author: Manoj <jonam33 at gmail.com>
Date:   Wed Aug 5 13:41:12 2015 -0400

    6588: Removed unused objects in user_settings_menu_test.

diff --git a/apps/workbench/test/integration/user_settings_menu_test.rb b/apps/workbench/test/integration/user_settings_menu_test.rb
index f6a0ce7..147b487 100644
--- a/apps/workbench/test/integration/user_settings_menu_test.rb
+++ b/apps/workbench/test/integration/user_settings_menu_test.rb
@@ -110,7 +110,6 @@ class UserSettingsMenuTest < ActionDispatch::IntegrationTest
   end
 
   test "verify repositories for active user" do
-    user = api_fixture('users')['active']
     visit page_with_token('active',"/users/#{api_fixture('users')['active']['uuid']}/repositories")
     repos = [[api_fixture('repositories')['foo'], true, true],
              [api_fixture('repositories')['repository3'], false, false],
@@ -135,7 +134,6 @@ class UserSettingsMenuTest < ActionDispatch::IntegrationTest
   end
 
   test "request shell access" do
-    user = api_fixture('users')['spectator']
     ActionMailer::Base.deliveries = []
     visit page_with_token('spectator', "/users/#{api_fixture('users')['spectator']['uuid']}/virtual_machines")
     assert_text 'You do not have access to any virtual machines'
@@ -149,6 +147,7 @@ class UserSettingsMenuTest < ActionDispatch::IntegrationTest
     assert_text 'A request for shell access was sent'
 
     # verify that the email was sent
+    user = api_fixture('users')['spectator']
     full_name = "#{user['first_name']} #{user['last_name']}"
     expected = "Shell account request from #{full_name} (#{user['email']}, #{user['uuid']})"
     found_email = 0

commit baccfce65b0c997202c22e36a2ebfc455eff0334
Merge: bdabb9a 5f3ac75
Author: Manoj <jonam33 at gmail.com>
Date:   Wed Aug 5 12:28:38 2015 -0400

    Merge branch 'master' into 6588-split-manage-account


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


hooks/post-receive
--