[ARVADOS] updated: e6c5563c60df03d4d061a6b301b730f0672b69a5

[git at public.curoverse.com]

Summary of changes:
 .../api/app/controllers/application_controller.rb  |   55 +++++++++-
 .../app/controllers/arvados/v1/jobs_controller.rb  |    1 +
 .../controllers/arvados/v1/schema_controller.rb    |    7 +-
 services/api/app/models/arvados_model.rb           |    6 +-
 services/api/config/application.default.yml        |    2 +-
 services/api/config/application.yml.example        |    9 +-
 .../functional/arvados/v1/jobs_controller_test.rb  |  123 ++++++++++++++++++++
 .../arvados/v1/keep_disks_controller_test.rb       |   28 +++++
 8 files changed, 224 insertions(+), 7 deletions(-)

       via  e6c5563c60df03d4d061a6b301b730f0672b69a5 (commit)
       via  10e70461bf3cb8c6ff859ce8313629a56783ba34 (commit)
       via  2f617987819f35c3b8ef7f3c6527d3772f8f5b76 (commit)
       via  a2de166ab578fcad18a3a27ff58f134af03b8275 (commit)
       via  1dec6cc7093bcc565bed2baba17c8a892b7e2633 (commit)
       via  35336cd73e444534cb2eda20e3730464cc4e6553 (commit)
       via  63e8f77e963949d4187555411e7b5c60fc850468 (commit)
       via  d7b51d23da327117fd94ad32d6be791cf50cbc11 (commit)
       via  4c159c650b13a8627c216712b71817fc9bcb7c62 (commit)
      from  e63c37081683a418bf1ad7b9428ffaf24fe6a8f1 (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 e6c5563c60df03d4d061a6b301b730f0672b69a5
Merge: e63c370 10e7046
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Fri Mar 14 13:57:40 2014 -0400

    Merge remote-tracking branch 'origin/master' into 2075-workbench-paging
    
    Conflicts:
    	services/api/app/controllers/arvados/v1/schema_controller.rb

diff --cc services/api/app/controllers/arvados/v1/schema_controller.rb
index 23706af,dde592e..f02a56b
--- a/services/api/app/controllers/arvados/v1/schema_controller.rb
+++ b/services/api/app/controllers/arvados/v1/schema_controller.rb
@@@ -222,13 -222,10 +222,18 @@@ class Arvados::V1::SchemaController < A
                    minimum: 0,
                    location: "query",
                  },
 +                offset: {
 +                  type: "integer",
 +                  description: "Number of #{k.to_s.underscore.pluralize} to skip before first returned record.",
 +                  default: 0,
 +                  format: "int32",
 +                  minimum: 0,
 +                  location: "query",
++                  },
+                 filters: {
+                   type: "array",
+                   description: "Conditions for filtering #{k.to_s.underscore.pluralize}.",
+                   location: "query"
                  },
                  where: {
                    type: "object",

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


hooks/post-receive
--