[ARVADOS] updated: 29665e2d9a543bffb237d148c3484c03b03e30aa

[Git user]

Summary of changes:
 apps/workbench/app/assets/images/trash-icon.png    | Bin 0 -> 18381 bytes
 .../workbench/app/assets/javascripts/filterable.js |   1 +
 .../app/assets/javascripts/select_modal.js         |   1 +
 .../app/assets/javascripts/selection.js.erb        |   4 +
 .../app/controllers/trash_items_controller.rb      |  88 ++++++++++
 apps/workbench/app/models/arvados_base.rb          |   4 +
 apps/workbench/app/models/arvados_resource_list.rb |   6 +
 apps/workbench/app/models/collection.rb            |   3 +
 .../app/views/application/_breadcrumbs.html.erb    |   7 +
 .../trash_items/_create_new_object_button.html.erb |   1 +
 .../views/trash_items/_show_recent_trash.html.erb  |  54 ++++++
 .../views/trash_items/_show_trash_rows.html.erb    |  32 ++++
 .../app/views/trash_items/_untrash_item.html.erb   |   7 +
 .../workbench/app/views/trash_items/index.html.erb |   1 +
 .../untrash_items.js.erb}                          |   3 +-
 .../views/work_units/_show_all_processes.html.erb  |   2 +-
 apps/workbench/config/routes.rb                    |   5 +
 apps/workbench/test/integration/trash_test.rb      |  87 ++++++++++
 build/run-tests.sh                                 |   2 +-
 sdk/go/arvados/client.go                           |  19 +-
 sdk/go/arvadosclient/arvadosclient.go              |  48 ++----
 sdk/go/keepclient/discover.go                      | 192 ++++++++++++++-------
 sdk/go/keepclient/discover_test.go                 |  17 +-
 sdk/go/keepclient/keepclient.go                    |  62 +++----
 sdk/go/keepclient/keepclient_test.go               |  17 +-
 sdk/go/keepclient/support.go                       |   5 +-
 .../arvados/v1/collections_controller.rb           |  13 +-
 .../arvados/v1/keep_services_controller.rb         |   1 +
 services/api/config/routes.rb                      |   1 +
 services/api/test/fixtures/collections.yml         |   2 +-
 .../arvados/v1/collections_controller_test.rb      |  18 ++
 .../arvados/v1/keep_services_controller_test.rb    |   6 +-
 services/keep-web/handler.go                       |   1 +
 services/keepproxy/keepproxy.go                    |   2 +-
 services/keepstore/pull_worker_integration_test.go |  13 +-
 tools/keep-block-check/keep-block-check.go         |  14 +-
 tools/keep-block-check/keep-block-check_test.go    |  13 +-
 tools/keep-rsync/keep-rsync.go                     |  14 +-
 tools/keep-rsync/keep-rsync_test.go                | 149 +++++++---------
 39 files changed, 634 insertions(+), 281 deletions(-)
 create mode 100644 apps/workbench/app/assets/images/trash-icon.png
 create mode 100644 apps/workbench/app/controllers/trash_items_controller.rb
 create mode 100644 apps/workbench/app/views/trash_items/_create_new_object_button.html.erb
 create mode 100644 apps/workbench/app/views/trash_items/_show_recent_trash.html.erb
 create mode 100644 apps/workbench/app/views/trash_items/_show_trash_rows.html.erb
 create mode 100644 apps/workbench/app/views/trash_items/_untrash_item.html.erb
 create mode 100644 apps/workbench/app/views/trash_items/index.html.erb
 copy apps/workbench/app/views/{projects/remove_items.js.erb => trash_items/untrash_items.js.erb} (58%)
 create mode 100644 apps/workbench/test/integration/trash_test.rb

       via  29665e2d9a543bffb237d148c3484c03b03e30aa (commit)
       via  87ea4388edb977d246b09b78d9d4bfa5c2ba5170 (commit)
       via  b42d7d9ed4640296ae5d01d26268c4fdba1ca10c (commit)
       via  f9ff1c5444f7030fa0b372446bd40d4feed203c8 (commit)
       via  cc77c62e148a632c5b690c275fd9fbf659ad2715 (commit)
       via  55315b668b8fa04572a44fd7db6598478f54130a (commit)
       via  0a6adabd77bf483186a29a7cffef38866a5ee8e0 (commit)
       via  0560a5812377315a92c8a4e9b41a68677832ea65 (commit)
       via  695a100d4bd3bf4f5534c7e489c118c2917bf35a (commit)
       via  dcd20d41fde4216345a20ddfa950b40de74b85b5 (commit)
       via  cb230b07e0125d819991bc74a1f528740068157d (commit)
       via  a10eb3ebf97a29687c6f43d705e30fb0349364d2 (commit)
       via  51549f93489f5d57f71b7767528ee7dec9079fb6 (commit)
       via  5f8a7ee855778644abf70e7058317891738d2ce1 (commit)
       via  5d03f6499055ef109ca2c8d5d59941b25de1fa47 (commit)
       via  f834a9841fe27c18bc31e58636ec1bcdb833b54b (commit)
       via  0f5295ae31362eefe182f3a2329b3903d6f82a3b (commit)
       via  c5e4c7027338235435e9698057847686baaee6cc (commit)
       via  41372eb0088174d02505f657f0fa2dabbc845791 (commit)
       via  75e00445b6de230493e9ee37483dd4c469db29b1 (commit)
       via  88abf688d7545fc663e0422f0c586107d4c56e5a (commit)
       via  6c40c1c5b000b2eb0967df0f7ebaf613393501bc (commit)
       via  916cf89b440fd13a9b9c055d817b34d339442ea3 (commit)
       via  6d9ac912d421951ec363e40fbcfde2428aa2f8d9 (commit)
       via  5a625a53394fa99ef7fb44ab63104b8195d963df (commit)
       via  9ff2df8cfa1f0798c22e4b3c6ef91d4677961295 (commit)
       via  7c7dc19ffa0a20fff6d97e51c874bfaca9596b24 (commit)
       via  554873d2fb3aa095caaa6fece1c2321008a85b24 (commit)
       via  7a98a4695a031c4b7b07d7244f3f293db7ebe0fc (commit)
       via  27355f62088566a9388972e128bfb8ba77790e9a (commit)
       via  65622f423c2ee35250856657b06118481d53edc8 (commit)
       via  741a9b3912c382b25507ca76fae15ddac020f302 (commit)
       via  1cdeb90e271f2a0c50d3552ff702b8e6f9489c74 (commit)
       via  fc10c21d75b15e36c4f861fdd17bf985ca83d888 (commit)
      from  4daf12ad8cb2f74c3f3d72eafef7ed7a0621a4ac (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 29665e2d9a543bffb237d148c3484c03b03e30aa
Merge: 4daf12a 87ea438
Author: Tom Clegg <tom at curoverse.com>
Date:   Tue Jun 6 13:53:36 2017 -0400

    11652: Merge branch 'master' into 11652-recursive-contents


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


hooks/post-receive
--