[ARVADOS] updated: e60b633d0b744084d3799b8437a3ee5482b06c9e

[Git user]

Summary of changes:
 services/api/app/controllers/arvados/v1/collections_controller.rb | 4 ++--
 services/api/app/controllers/arvados/v1/groups_controller.rb      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

       via  e60b633d0b744084d3799b8437a3ee5482b06c9e (commit)
       via  82c90381c1ebdab5be7870b13ca8898e81b042c8 (commit)
       via  d66b42e150030edff5ddb211d76d03d4bcd572ec (commit)
      from  3c007c51881e1f89b6a7db3af1a09ecfa96f2631 (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 e60b633d0b744084d3799b8437a3ee5482b06c9e
Author: radhika <radhika at curoverse.com>
Date:   Mon Jun 12 10:36:42 2017 -0400

    11821: include default=false to the include_trash and recursive parameters.
    
    Arvados-DCO-1.1-Signed-off-by: Radhika Chippada <radhika at curoverse.com>

diff --git a/services/api/app/controllers/arvados/v1/collections_controller.rb b/services/api/app/controllers/arvados/v1/collections_controller.rb
index 98f453b..6e55bff 100644
--- a/services/api/app/controllers/arvados/v1/collections_controller.rb
+++ b/services/api/app/controllers/arvados/v1/collections_controller.rb
@@ -7,7 +7,7 @@ class Arvados::V1::CollectionsController < ApplicationController
     (super rescue {}).
       merge({
         include_trash: {
-          type: 'boolean', required: false, description: "Include collections whose is_trashed attribute is true."
+          type: 'boolean', required: false, default: false, description: "Include collections whose is_trashed attribute is true."
         },
       })
   end
@@ -22,7 +22,7 @@ class Arvados::V1::CollectionsController < ApplicationController
   end
 
   def find_objects_for_index
-    if params[:include_trash].andand.==(true || "true") || ['destroy', 'trash', 'untrash'].include?(action_name)
+    if params[:include_trash] || ['destroy', 'trash', 'untrash'].include?(action_name)
       @objects = Collection.unscoped.readable_by(*@read_users)
     end
     super
diff --git a/services/api/app/controllers/arvados/v1/groups_controller.rb b/services/api/app/controllers/arvados/v1/groups_controller.rb
index fc80a65..38e5963 100644
--- a/services/api/app/controllers/arvados/v1/groups_controller.rb
+++ b/services/api/app/controllers/arvados/v1/groups_controller.rb
@@ -7,7 +7,7 @@ class Arvados::V1::GroupsController < ApplicationController
                 type: 'string', required: false, default: nil
               },
               recursive: {
-                type: 'boolean', required: false, description: 'Include contents from child groups recursively.'
+                type: 'boolean', required: false, default: false, description: 'Include contents from child groups recursively.'
               },
             })
     params.delete(:select)

commit 82c90381c1ebdab5be7870b13ca8898e81b042c8
Merge: 3c007c5 d66b42e
Author: radhika <radhika at curoverse.com>
Date:   Fri Jun 9 18:37:11 2017 -0400

    Merge branch 'master' into 11821-discovery-doc-updates


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


hooks/post-receive
--