[ARVADOS] updated: 6eded76b722df150ce59a1bddd2fb7e5175a596d

[Git user]

Summary of changes:
 .../app/controllers/projects_controller.rb         |   2 +-
 sdk/go/arvados/collection.go                       |   5 +-
 sdk/go/keepclient/collectionreader.go              |   6 +-
 sdk/go/keepclient/collectionreader_test.go         |  10 +-
 sdk/go/manifest/manifest.go                        | 340 ++++++++++++++++++---
 sdk/go/manifest/manifest_test.go                   | 126 +++++++-
 sdk/go/manifest/testdata/long_manifest             |   8 +-
 sdk/go/manifest/testdata/short_manifest            |   7 +-
 .../crunch-dispatch-slurm/crunch-dispatch-slurm.go |   2 +-
 9 files changed, 436 insertions(+), 70 deletions(-)

       via  6eded76b722df150ce59a1bddd2fb7e5175a596d (commit)
       via  d6cc6f748c79e9bbd0ba18dd8d32ae210a7b897b (commit)
       via  80689aac71f6e3e9b103f0f6b668bd173a76554f (commit)
       via  4ee34d218487d8b330147b185a2c9bcea8d68b09 (commit)
       via  d95e6df5184ab2ec137c8098b47caf9ebcf4e7d9 (commit)
       via  7b4c1b70b7d1ef4c977c57c89c4dc0f479e7e5ae (commit)
       via  4c081dd00f65f1e5a8e0cea34276d60ecbb49f40 (commit)
       via  2b297df85b61ac7f2ded512eca7c307d75b1cd8e (commit)
       via  5bf9312a5174f97f00db383836eb7666dc500293 (commit)
       via  2b7834020290b28d797333f90fcb87e5da67d616 (commit)
       via  8e7c3b36efef6ef6590f4359eb48bf98826d71d4 (commit)
       via  4c1ca6b3e4cadc74df738882d44019c623869329 (commit)
       via  ab6a70e86dd041f3b4da167c59e3e91309f14365 (commit)
      from  4dbaf8c355f3743bd42ff5b917eda57d3e90abf8 (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 6eded76b722df150ce59a1bddd2fb7e5175a596d
Merge: d6cc6f7 80689aa
Author: Lucas Di Pentima <lucas at curoverse.com>
Date:   Fri Feb 10 15:04:41 2017 -0300

    3900: Merge branch 'master' into 3900-trash-collections-delete-api


commit d6cc6f748c79e9bbd0ba18dd8d32ae210a7b897b
Author: Lucas Di Pentima <lucas at curoverse.com>
Date:   Fri Feb 10 15:01:45 2017 -0300

    3900: Flipped item.destroy call for semantics reasons

diff --git a/apps/workbench/app/controllers/projects_controller.rb b/apps/workbench/app/controllers/projects_controller.rb
index dbb087b..2cd668a 100644
--- a/apps/workbench/app/controllers/projects_controller.rb
+++ b/apps/workbench/app/controllers/projects_controller.rb
@@ -151,8 +151,8 @@ class ProjectsController < ApplicationController
 
       if item.class == Collection
         # Use delete API on collections
-        @removed_uuids << item.uuid
         item.destroy
+        @removed_uuids << item.uuid
       elsif item.owner_uuid == @object.uuid
         # Object is owned by this project. Remove it from the project by
         # changing owner to the current user.

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


hooks/post-receive
--