From: Tim Pierce <twp@curoverse.com>
Date: Tue, 21 Jan 2014 22:14:40 +0000 (-0500)
Subject: Merge branch '1943-client-sdk-config-files'
X-Git-Tag: 1.1.0~2722^2~61
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/d84737275793fcab0ac253c4abe734ad5e84ea12?hp=-c

Merge branch '1943-client-sdk-config-files'

Conflicts:
	sdk/python/arvados/__init__.py
---

d84737275793fcab0ac253c4abe734ad5e84ea12
diff --combined services/api/app/controllers/arvados/v1/schema_controller.rb
index 96e4323887,8a16356c0d..e57ca52081
--- a/services/api/app/controllers/arvados/v1/schema_controller.rb
+++ b/services/api/app/controllers/arvados/v1/schema_controller.rb
@@@ -23,7 -23,6 +23,7 @@@ class Arvados::V1::SchemaController < A
    end
  
    def discovery_rest_description
 +    expires_in 24.hours, public: true
      discovery = Rails.cache.fetch 'arvados_v1_rest_discovery' do
        Rails.application.eager_load!
        discovery = {
@@@ -189,7 -188,28 +189,28 @@@
                id: "arvados.#{k.to_s.underscore.pluralize}.list",
                path: k.to_s.underscore.pluralize,
                httpMethod: "GET",
-               description: "List #{k.to_s.underscore.pluralize}.",
+               description:
+                  %|List #{k.to_s.pluralize}.
+ 
+                    The <code>list</code> method returns a 
+                    <a href="/api/resources.html">resource list</a> of
+                    matching #{k.to_s.pluralize}. For example:
+ 
+                    <pre>
+                    {
+                     "kind":"arvados##{k.to_s.camelcase(:lower)}List",
+                     "etag":"",
+                     "self_link":"",
+                     "next_page_token":"",
+                     "next_link":"",
+                     "items":[
+                        ...
+                     ],
+                     "items_available":745,
+                     "_profile":{
+                      "request_time":0.157236317
+                     }
+                     </pre>|,
                parameters: {
                  limit: {
                    type: "integer",
@@@ -197,17 -217,7 +218,7 @@@
                    default: 100,
                    format: "int32",
                    minimum: 0,
-                   location: "query"
-                 },
-                 pageToken: {
-                   type: "string",
-                   description: "Page token.",
-                   location: "query"
-                 },
-                 q: {
-                   type: "string",
-                   description: "Query string for searching #{k.to_s.underscore.pluralize}.",
-                   location: "query"
+                   location: "query",
                  },
                  where: {
                    type: "object",