[ARVADOS] updated: c5293d314b5ac46ef712ffbee0c2fa64e8baba52

git at public.curoverse.com git at public.curoverse.com
Fri Dec 27 16:41:22 EST 2013


Summary of changes:
 doc/api/crunch-scripts.textile                     |    4 +-
 doc/api/index.textile                              |   44 +++++++-------
 .../{ApiClients.textile => ApiClient.textile}      |    8 +-
 doc/api/schema/ApiClientAuthorization.textile      |    4 +-
 doc/api/schema/AuthorizedKey.textile               |    6 +-
 .../{Collections.textile => Collection.textile}    |    8 +-
 doc/api/schema/Commit.textile                      |    6 +-
 doc/api/schema/CommitAncestor.textile              |    6 +-
 doc/api/schema/Group.textile                       |    6 +-
 doc/api/schema/Human.textile                       |    6 +-
 doc/api/schema/{Jobs.textile => Job.textile}       |   10 ++--
 .../schema/{JobTasks.textile => JobTask.textile}   |    8 +-
 doc/api/schema/KeepDisk.textile                    |    6 +-
 doc/api/schema/Link.textile                        |   62 ++++++++++++-------
 doc/api/schema/Links.textile                       |   58 ------------------
 doc/api/schema/Log.textile                         |    6 +-
 doc/api/schema/Node.textile                        |    6 +-
 doc/api/schema/PipelineInstance.textile            |    6 +-
 doc/api/schema/PipelineTemplate.textile            |    6 +-
 doc/api/schema/Repository.textile                  |    6 +-
 doc/api/schema/Specimen.textile                    |    6 +-
 doc/api/schema/Trait.textile                       |    6 +-
 doc/api/schema/User.textile                        |    6 +-
 doc/api/schema/VirtualMachine.textile              |    6 +-
 docker/run.sh                                      |    2 +-
 25 files changed, 128 insertions(+), 170 deletions(-)
 rename doc/api/schema/{ApiClients.textile => ApiClient.textile} (81%)
 rename doc/api/schema/{Collections.textile => Collection.textile} (89%)
 rename doc/api/schema/{Jobs.textile => Job.textile} (90%)
 rename doc/api/schema/{JobTasks.textile => JobTask.textile} (93%)
 delete mode 100644 doc/api/schema/Links.textile

       via  c5293d314b5ac46ef712ffbee0c2fa64e8baba52 (commit)
      from  6d69aeff49ee75d8d132ef1e51a20c5caef21cc4 (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 c5293d314b5ac46ef712ffbee0c2fa64e8baba52
Author: Tim Pierce <twp at clinicalfuture.com>
Date:   Fri Dec 27 16:40:59 2013 -0500

    Normalize API documentation names, fix links, etc. (refs #1608)

diff --git a/doc/api/crunch-scripts.textile b/doc/api/crunch-scripts.textile
index 10f0c65..3048fa7 100644
--- a/doc/api/crunch-scripts.textile
+++ b/doc/api/crunch-scripts.textile
@@ -20,8 +20,8 @@ A task's context is provided in environment variables.
 
 table(table table-bordered table-condensed).
 |Environment variable|Description|
-|@JOB_UUID@|UUID of the current "Job":Jobs.html|
-|@TASK_UUID@|UUID of the current "JobTask":JobTasks.html|
+|@JOB_UUID@|UUID of the current "Job":schema/Jobs.html|
+|@TASK_UUID@|UUID of the current "JobTask":schema/JobTasks.html|
 |@ARVADOS_API_HOST@|Hostname and port number of API server|
 |@ARVADOS_API_TOKEN@|Authentication token to use with API calls made by the current task|
 
diff --git a/doc/api/index.textile b/doc/api/index.textile
index 5582fb0..271b2da 100644
--- a/doc/api/index.textile
+++ b/doc/api/index.textile
@@ -13,40 +13,40 @@ h2. Concepts
 * Resources in requests and responses adhere to a "common structure":resources.html.
 * API transactions use common "REST methods":methods.html.
 * API transactions are subject to a "permission model":permission-model.html.
-* "Job tasks":job-task.html use some special API features.
+* "Job tasks":schema/JobTasks.html use some special API features.
 
 h2. Resources
 
 h3. Generic Resources
 
-* "Collections":Collections.html
-* "Jobs":Jobs.html
-* "JobTasks":JobTasks.html
-* "Links":Links.html
-* "Log":Log.html
-* "PipelineTemplate":PipelineTemplate.html
-* "PipelineInstance":PipelineInstance.html
-* "Group":Group.html
-* "Human":Human.html
-* "Specimen":Specimen.html
-* "Trait":Trait.html
-* "User":User.html
+* "Collections":schema/Collections.html
+* "Jobs":schema/Jobs.html
+* "JobTasks":schema/JobTasks.html
+* "Links":schema/Links.html
+* "Log":schema/Log.html
+* "PipelineTemplate":schema/PipelineTemplate.html
+* "PipelineInstance":schema/PipelineInstance.html
+* "Group":schema/Group.html
+* "Human":schema/Human.html
+* "Specimen":schema/Specimen.html
+* "Trait":schema/Trait.html
+* "User":schema/User.html
 
 h3. Authentication
 
 These Arvados resources govern authorization and "authentication":authentication.html:
 
-* "ApiClients":ApiClients.html
-* "ApiClientAuthorization":ApiClientAuthorization.html
-* "AuthorizedKey":AuthorizedKey.html
+* "ApiClients":schema/ApiClients.html
+* "ApiClientAuthorization":schema/ApiClientAuthorization.html
+* "AuthorizedKey":schema/AuthorizedKey.html
 
 h3. Arvados Infrastructure
 
 These resources govern the Arvados infrastructure itself: Git repositories, Keep disks, active nodes, etc.
 
-* "CommitAncestor":CommitAncestor.html
-* "Commit":Commit.html
-* "KeepDisk":KeepDisk.html
-* "Node":Node.html
-* "Repository":Repository.html
-* "VirtualMachine":VirtualMachine.html
+* "CommitAncestor":schema/CommitAncestor.html
+* "Commit":schema/Commit.html
+* "KeepDisk":schema/KeepDisk.html
+* "Node":schema/Node.html
+* "Repository":schema/Repository.html
+* "VirtualMachine":schema/VirtualMachine.html
diff --git a/doc/api/schema/ApiClients.textile b/doc/api/schema/ApiClient.textile
similarity index 81%
rename from doc/api/schema/ApiClients.textile
rename to doc/api/schema/ApiClient.textile
index 4f338f0..004ed15 100644
--- a/doc/api/schema/ApiClients.textile
+++ b/doc/api/schema/ApiClient.textile
@@ -2,18 +2,18 @@
 layout: default
 navsection: api
 navmenu: Schema
-title: "Resource: ApiClient"
+title: ApiClient
 navorder: 2
 ---
 
-h1. ApiClients
+h1. ApiClient
 
 An **ApiClient** represents a client program that has issued a request to the API server.
 
 
 h2. Methods
 
-See "REST methods for working with Arvados resources":methods.html
+See "REST methods for working with Arvados resources":/api/methods.html
 
 API endpoint base: @https://{{ site.arvados_api_host }}/arvados/v1/api_clients@
 
@@ -29,7 +29,7 @@ Side effects of creating an ApiClient.
 
 h2. Resources
 
-Each ApiClient has, in addition to the usual "attributes of Arvados resources":resources.html:
+Each ApiClient has, in addition to the usual "attributes of Arvados resources":/api/resources.html:
 
 table(table table-bordered table-condensed).
 |*Attribute*|*Type*|*Description*|*Example*|
diff --git a/doc/api/schema/ApiClientAuthorization.textile b/doc/api/schema/ApiClientAuthorization.textile
index dd841d2..8e71afe 100644
--- a/doc/api/schema/ApiClientAuthorization.textile
+++ b/doc/api/schema/ApiClientAuthorization.textile
@@ -2,7 +2,7 @@
 layout: default
 navsection: api
 navmenu: Schema
-title: "Resource: ApiClientAuthorization"
+title: ApiClientAuthorization
 navorder: 1
 ---
 
@@ -12,7 +12,7 @@ A **ApiClientAuthorization** represents the API authorization token that has bee
 
 h2. Methods
 
-See "REST methods for working with Arvados resources":methods.html
+See "REST methods for working with Arvados resources":/api/methods.html
 
 API endpoint base: @https://{{ site.arvados_api_host }}/arvados/v1/api_client_authorization@
 
diff --git a/doc/api/schema/AuthorizedKey.textile b/doc/api/schema/AuthorizedKey.textile
index e42facc..d1b57dd 100644
--- a/doc/api/schema/AuthorizedKey.textile
+++ b/doc/api/schema/AuthorizedKey.textile
@@ -2,7 +2,7 @@
 layout: default
 navsection: api
 navmenu: Schema
-title: "Resource: AuthorizedKey"
+title: AuthorizedKey
 navorder: 3
 ---
 
@@ -12,7 +12,7 @@ A **AuthorizedKey** represents...
 
 h2. Methods
 
-See "REST methods for working with Arvados resources":methods.html
+See "REST methods for working with Arvados resources":/api/methods.html
 
 API endpoint base: @https://{{ site.arvados_api_host }}/arvados/v1/authorized_key@
 
@@ -28,7 +28,7 @@ Side effects of creating a AuthorizedKey.
 
 h2. Resources
 
-Each AuthorizedKey has, in addition to the usual "attributes of Arvados resources":resources.html:
+Each AuthorizedKey has, in addition to the usual "attributes of Arvados resources":/api/resources.html:
 
 table(table table-bordered table-condensed).
 |*Attribute*|*Type*|*Description*|*Example*|
diff --git a/doc/api/schema/Collections.textile b/doc/api/schema/Collection.textile
similarity index 89%
rename from doc/api/schema/Collections.textile
rename to doc/api/schema/Collection.textile
index 0210793..0b0e970 100644
--- a/doc/api/schema/Collections.textile
+++ b/doc/api/schema/Collection.textile
@@ -2,18 +2,18 @@
 layout: default
 navsection: api
 navmenu: Schema
-title: "Resource: Collections"
+title: Collection
 navorder: 4
 ---
 
-h1. Collections
+h1. Collection
 
 This resource concerns metadata, usage accounting, and integrity checks for data stored on the cloud.  Reading and writing the data _per se_ is achieved by the "Keep":{{ baseurl }}/user/intro-keep.html storage system.
 
 
 h2. Methods
 
-See "REST methods for working with Arvados resources":methods.html
+See "REST methods for working with Arvados resources":/api/methods.html
 
 API endpoint base: @https://{{ site.arvados_api_host }}/arvados/v1/links@
 
@@ -31,7 +31,7 @@ Clients can request checks of data integrity and storage redundancy.
 
 h2. Resource
 
-Each collection has, in addition to the usual "attributes of Arvados resources":resources.html:
+Each collection has, in addition to the usual "attributes of Arvados resources":/api/resources.html:
 
 table(table table-bordered table-condensed).
 |*Attribute*|*Type*|*Description*|*Example*|
diff --git a/doc/api/schema/Commit.textile b/doc/api/schema/Commit.textile
index 1dcfd79..19c54b8 100644
--- a/doc/api/schema/Commit.textile
+++ b/doc/api/schema/Commit.textile
@@ -2,7 +2,7 @@
 layout: default
 navsection: api
 navmenu: Schema
-title: "Resource: Commit"
+title: Commit
 navorder: 6
 ---
 
@@ -12,7 +12,7 @@ A **Commit** represents...
 
 h2. Methods
 
-See "REST methods for working with Arvados resources":methods.html
+See "REST methods for working with Arvados resources":/api/methods.html
 
 API endpoint base: @https://{{ site.arvados_api_host }}/arvados/v1/commit@
 
@@ -28,7 +28,7 @@ Side effects of creating a Commit.
 
 h2. Resources
 
-Each Commit has, in addition to the usual "attributes of Arvados resources":resources.html:
+Each Commit has, in addition to the usual "attributes of Arvados resources":/api/resources.html:
 
 table(table table-bordered table-condensed).
 |*Attribute*|*Type*|*Description*|*Example*|
diff --git a/doc/api/schema/CommitAncestor.textile b/doc/api/schema/CommitAncestor.textile
index c105d7d..56fd5c5 100644
--- a/doc/api/schema/CommitAncestor.textile
+++ b/doc/api/schema/CommitAncestor.textile
@@ -2,7 +2,7 @@
 layout: default
 navsection: api
 navmenu: Schema
-title: "Resource: CommitAncestor"
+title: CommitAncestor
 navorder: 5
 ---
 
@@ -12,7 +12,7 @@ A **CommitAncestor** represents...
 
 h2. Methods
 
-See "REST methods for working with Arvados resources":methods.html
+See "REST methods for working with Arvados resources":/api/methods.html
 
 API endpoint base: @https://{{ site.arvados_api_host }}/arvados/v1/commit_ancestor@
 
@@ -28,7 +28,7 @@ Side effects of creating a CommitAncestor.
 
 h2. Resources
 
-Each CommitAncestor has, in addition to the usual "attributes of Arvados resources":resources.html:
+Each CommitAncestor has, in addition to the usual "attributes of Arvados resources":/api/resources.html:
 
 table(table table-bordered table-condensed).
 |*Attribute*|*Type*|*Description*|*Example*|
diff --git a/doc/api/schema/Group.textile b/doc/api/schema/Group.textile
index 14e5aa0..6854241 100644
--- a/doc/api/schema/Group.textile
+++ b/doc/api/schema/Group.textile
@@ -2,7 +2,7 @@
 layout: default
 navsection: api
 navmenu: Schema
-title: "Resource: Group"
+title: Group
 navorder: 7
 ---
 
@@ -12,7 +12,7 @@ A **Group** represents...
 
 h2. Methods
 
-See "REST methods for working with Arvados resources":methods.html
+See "REST methods for working with Arvados resources":/api/methods.html
 
 API endpoint base: @https://{{ site.arvados_api_host }}/arvados/v1/group@
 
@@ -28,7 +28,7 @@ Side effects of creating a Group.
 
 h2. Resources
 
-Each Group has, in addition to the usual "attributes of Arvados resources":resources.html:
+Each Group has, in addition to the usual "attributes of Arvados resources":/api/resources.html:
 
 table(table table-bordered table-condensed).
 |*Attribute*|*Type*|*Description*|*Example*|
diff --git a/doc/api/schema/Human.textile b/doc/api/schema/Human.textile
index f5ccf8a..9fce0ad 100644
--- a/doc/api/schema/Human.textile
+++ b/doc/api/schema/Human.textile
@@ -2,7 +2,7 @@
 layout: default
 navsection: api
 navmenu: Schema
-title: "Resource: Human"
+title: Human
 navorder: 8
 ---
 
@@ -12,7 +12,7 @@ A **Human** represents...
 
 h2. Methods
 
-See "REST methods for working with Arvados resources":methods.html
+See "REST methods for working with Arvados resources":/api/methods.html
 
 API endpoint base: @https://{{ site.arvados_api_host }}/arvados/v1/human@
 
@@ -28,7 +28,7 @@ Side effects of creating a Human.
 
 h2. Resources
 
-Each Human has, in addition to the usual "attributes of Arvados resources":resources.html:
+Each Human has, in addition to the usual "attributes of Arvados resources":/api/resources.html:
 
 table(table table-bordered table-condensed).
 |*Attribute*|*Type*|*Description*|*Example*|
diff --git a/doc/api/schema/Jobs.textile b/doc/api/schema/Job.textile
similarity index 90%
rename from doc/api/schema/Jobs.textile
rename to doc/api/schema/Job.textile
index b0ccfa6..8c1e61b 100644
--- a/doc/api/schema/Jobs.textile
+++ b/doc/api/schema/Job.textile
@@ -2,11 +2,11 @@
 layout: default
 navsection: api
 navmenu: Schema
-title: "Resource: Jobs"
+title: Job
 navorder: 9
 ---
 
-h1. Jobs
+h1. Job
 
 Applications submit compute jobs when:
 * Provenance is important, i.e., it is worth recording how the output was produced; or
@@ -15,7 +15,7 @@ Applications submit compute jobs when:
 
 h2. Methods
 
-See "REST methods for working with Arvados resources":methods.html
+See "REST methods for working with Arvados resources":/api/methods.html
 
 API endpoint base: @https://{{ site.arvados_api_host }}/arvados/v1/jobs@
 
@@ -37,11 +37,11 @@ where[owner_uuid]=xyzzy-tpzed-a4lcehql0dv2u25
 
 → Job resource list
 
-This method is equivalent to the "index method":methods.html#index, except that the results are restricted to queued jobs (i.e., jobs that have not yet been started or cancelled) and order defaults to queue priority.
+This method is equivalent to the "index method":/api/methods.html#index, except that the results are restricted to queued jobs (i.e., jobs that have not yet been started or cancelled) and order defaults to queue priority.
 
 h2. Resource
 
-Each job has, in addition to the usual "attributes of Arvados resources":resources.html:
+Each job has, in addition to the usual "attributes of Arvados resources":/api/resources.html:
 
 table(table table-bordered table-condensed).
 |*Attribute*|*Type*|*Description*|*Notes*|
diff --git a/doc/api/schema/JobTasks.textile b/doc/api/schema/JobTask.textile
similarity index 93%
rename from doc/api/schema/JobTasks.textile
rename to doc/api/schema/JobTask.textile
index e86f111..04b8bdc 100644
--- a/doc/api/schema/JobTasks.textile
+++ b/doc/api/schema/JobTask.textile
@@ -2,11 +2,11 @@
 layout: default
 navsection: api
 navmenu: Schema
-title: "Resource: JobTasks"
+title: JobTask
 navorder: 10
 ---
 
-h1. JobTasks
+h1. JobTask
 
 A Job Task is a well defined independently-computable portion of a "Job":Jobs.html.
 
@@ -22,13 +22,13 @@ Job tasks have particular update semantics:
 
 h2. Methods
 
-See "REST methods for working with Arvados resources":methods.html
+See "REST methods for working with Arvados resources":/api/methods.html
 
 API endpoint base: @https://{{ site.arvados_api_host }}/arvados/v1/job_tasks@
 
 h2. Resources
 
-Each JobTask has, in addition to the usual "attributes of Arvados resources":resources.html:
+Each JobTask has, in addition to the usual "attributes of Arvados resources":/api/resources.html:
 
 table(table table-bordered table-condensed).
 |*Attribute*|*Type*|*Description*|*Example*|
diff --git a/doc/api/schema/KeepDisk.textile b/doc/api/schema/KeepDisk.textile
index 4d192e9..7ab4cf7 100644
--- a/doc/api/schema/KeepDisk.textile
+++ b/doc/api/schema/KeepDisk.textile
@@ -2,7 +2,7 @@
 layout: default
 navsection: api
 navmenu: Schema
-title: "Resource: KeepDisk"
+title: KeepDisk
 navorder: 11
 ---
 
@@ -12,7 +12,7 @@ A **KeepDisk** represents...
 
 h2. Methods
 
-See "REST methods for working with Arvados resources":methods.html
+See "REST methods for working with Arvados resources":/api/methods.html
 
 API endpoint base: @https://{{ site.arvados_api_host }}/arvados/v1/keep_disk@
 
@@ -28,7 +28,7 @@ Side effects of creating a KeepDisk.
 
 h2. Resources
 
-Each KeepDisk has, in addition to the usual "attributes of Arvados resources":resources.html:
+Each KeepDisk has, in addition to the usual "attributes of Arvados resources":/api/resources.html:
 
 table(table table-bordered table-condensed).
 |*Attribute*|*Type*|*Description*|*Example*|
diff --git a/doc/api/schema/Link.textile b/doc/api/schema/Link.textile
index a1252fb..0b2cf5e 100644
--- a/doc/api/schema/Link.textile
+++ b/doc/api/schema/Link.textile
@@ -2,41 +2,57 @@
 layout: default
 navsection: api
 navmenu: Schema
-title: "Resource: Link"
-navorder: 13
+title: Link
+navorder: 12
 ---
 
 h1. Link
 
-A **Link** represents...
+Links encode connections between Arvados objects, and from objects to primitives.  Each metadata object has a tail (subject), class, name, properties, and head (object or value).
 
-h2. Methods
-
-See "REST methods for working with Arvados resources":methods.html
+table(table table-bordered table-condensed).
+|tail (object)| _class, name_ 
+→
+ _properties{}_ |head (object)|
 
-API endpoint base: @https://{{ site.arvados_api_host }}/arvados/v1/link@
+h2. Methods
 
-h2. Creation
+See "REST methods for working with Arvados resources":/api/methods.html
 
-h3. Prerequisites
+API endpoint base: @https://{{ site.arvados_api_host }}/arvados/v1/links@
 
-Prerequisites for creating a Link.
+h2. Resource
 
-h3. Side effects
+Each link has, in addition to the usual "attributes of Arvados resources":/api/resources.html:
 
-Side effects of creating a Link.
+table(table table-bordered table-condensed).
+|*Attribute*|*Type*|*Description*|
+|tail_uuid|string|Object UUID at the tail (start, source, origin) of this link|
+|tail_kind|string|Object kind at the tail (start, source, origin) of this link|
+|link_class|string|Class (see below)|
+|name|string|Link type (see below)|
+|head_uuid|string|Object UUID at the head (end, destination, target) of this link|
+|head_kind|string|Object kind at the head (end, destination, target) of this link|
+|properties{}|list|Additional information, expressed as a key→value hash. Key: string. Value: string, number, array, or hash.|
 
-h2. Resources
+h2. Link classes
 
-Each Link has, in addition to the usual "attributes of Arvados resources":resources.html:
+Some classes are pre-defined by convention and have standard meanings attached to names.
 
 table(table table-bordered table-condensed).
-|*Attribute*|*Type*|*Description*|*Example*|
-|tail_uuid|string|||
-|tail_kind|string|||
-|link_class|string|||
-|name|string|||
-|head_uuid|string|||
-|properties|Hash|||
-|updated_at|datetime|||
-|head_kind|string|||
+|*link_class*|*tail_type→head_type*|*name→head_uuid {properties}*|*Notes*|
+|provenance|→Collection  |provided → _collection uuid_
+{url→http://example.com/foo.tgz, retrieved_at→1352616640.000}||
+|provenance|Job→Collection     |provided → _collection uuid_||
+|provenance|Specimen→Collection|provided → _collection uuid_||
+|provenance|Human→Specimen     |provided → _specimen uuid_||
+|provenance|Human→Collection   |provided → _collection uuid_||
+|human_trait|Human→Trait  |measured → _trait uuid_ {value→1.83, unit→metre, measured_at→1352616640.000}||
+|identifier|→Human        |hu123456 → _human uuid_||
+|permission|User→Group  |can_manage → _group uuid_|Writable only by a user who can_manage this group|
+|permission|User→Group  |can_read → _group uuid_  |Writable only by a user who can_manage this group.
+Gives permission to read any object owned by this group.|
+|resources|User→Collection|wants → _collection uuid_    |Determines whether data can be deleted|
+|resources|User→Job       |wants → _job uuid_    |Determines whether a job can be cancelled|
+
+For links that don't make sense to share between API clients, a link class like @client.my_app_id@ or @client.my_app_id.anythinghere@ should be used.
diff --git a/doc/api/schema/Links.textile b/doc/api/schema/Links.textile
deleted file mode 100644
index 0332ca9..0000000
--- a/doc/api/schema/Links.textile
+++ /dev/null
@@ -1,58 +0,0 @@
----
-layout: default
-navsection: api
-navmenu: Schema
-title: "Resource: Links"
-navorder: 12
----
-
-h1. Links
-
-Links encode connections between Arvados objects, and from objects to primitives.  Each metadata object has a tail (subject), class, name, properties, and head (object or value).
-
-table(table table-bordered table-condensed).
-|tail (object)| _class, name_ 
-→
- _properties{}_ |head (object)|
-
-h2. Methods
-
-See "REST methods for working with Arvados resources":methods.html
-
-API endpoint base: @https://{{ site.arvados_api_host }}/arvados/v1/links@
-
-h2. Resource
-
-Each link has, in addition to the usual "attributes of Arvados resources":resources.html:
-
-table(table table-bordered table-condensed).
-|*Attribute*|*Type*|*Description*|
-|tail_uuid|string|Object UUID at the tail (start, source, origin) of this link|
-|tail_kind|string|Object kind at the tail (start, source, origin) of this link|
-|link_class|string|Class (see below)|
-|name|string|Link type (see below)|
-|head_uuid|string|Object UUID at the head (end, destination, target) of this link|
-|head_kind|string|Object kind at the head (end, destination, target) of this link|
-|properties{}|list|Additional information, expressed as a key→value hash. Key: string. Value: string, number, array, or hash.|
-
-h2. Link classes
-
-Some classes are pre-defined by convention and have standard meanings attached to names.
-
-table(table table-bordered table-condensed).
-|*link_class*|*tail_type→head_type*|*name→head_uuid {properties}*|*Notes*|
-|provenance|→Collection  |provided → _collection uuid_
-{url→http://example.com/foo.tgz, retrieved_at→1352616640.000}||
-|provenance|Job→Collection     |provided → _collection uuid_||
-|provenance|Specimen→Collection|provided → _collection uuid_||
-|provenance|Human→Specimen     |provided → _specimen uuid_||
-|provenance|Human→Collection   |provided → _collection uuid_||
-|human_trait|Human→Trait  |measured → _trait uuid_ {value→1.83, unit→metre, measured_at→1352616640.000}||
-|identifier|→Human        |hu123456 → _human uuid_||
-|permission|User→Group  |can_manage → _group uuid_|Writable only by a user who can_manage this group|
-|permission|User→Group  |can_read → _group uuid_  |Writable only by a user who can_manage this group.
-Gives permission to read any object owned by this group.|
-|resources|User→Collection|wants → _collection uuid_    |Determines whether data can be deleted|
-|resources|User→Job       |wants → _job uuid_    |Determines whether a job can be cancelled|
-
-For links that don't make sense to share between API clients, a link class like @client.my_app_id@ or @client.my_app_id.anythinghere@ should be used.
diff --git a/doc/api/schema/Log.textile b/doc/api/schema/Log.textile
index 516f0d3..590da00 100644
--- a/doc/api/schema/Log.textile
+++ b/doc/api/schema/Log.textile
@@ -2,7 +2,7 @@
 layout: default
 navsection: api
 navmenu: Schema
-title: "Resource: Log"
+title: Log
 navorder: 14
 ---
 
@@ -12,7 +12,7 @@ A **Log** represents...
 
 h2. Methods
 
-See "REST methods for working with Arvados resources":methods.html
+See "REST methods for working with Arvados resources":/api/methods.html
 
 API endpoint base: @https://{{ site.arvados_api_host }}/arvados/v1/log@
 
@@ -28,7 +28,7 @@ Side effects of creating a Log.
 
 h2. Resources
 
-Each Log has, in addition to the usual "attributes of Arvados resources":resources.html:
+Each Log has, in addition to the usual "attributes of Arvados resources":/api/resources.html:
 
 table(table table-bordered table-condensed).
 |*Attribute*|*Type*|*Description*|*Example*|
diff --git a/doc/api/schema/Node.textile b/doc/api/schema/Node.textile
index aefde93..c63ebba 100644
--- a/doc/api/schema/Node.textile
+++ b/doc/api/schema/Node.textile
@@ -2,7 +2,7 @@
 layout: default
 navsection: api
 navmenu: Schema
-title: "Resource: Node"
+title: Node
 navorder: 15
 ---
 
@@ -12,7 +12,7 @@ A **Node** represents...
 
 h2. Methods
 
-See "REST methods for working with Arvados resources":methods.html
+See "REST methods for working with Arvados resources":/api/methods.html
 
 API endpoint base: @https://{{ site.arvados_api_host }}/arvados/v1/node@
 
@@ -28,7 +28,7 @@ Side effects of creating a Node.
 
 h2. Resources
 
-Each Node has, in addition to the usual "attributes of Arvados resources":resources.html:
+Each Node has, in addition to the usual "attributes of Arvados resources":/api/resources.html:
 
 table(table table-bordered table-condensed).
 |*Attribute*|*Type*|*Description*|*Example*|
diff --git a/doc/api/schema/PipelineInstance.textile b/doc/api/schema/PipelineInstance.textile
index 9ae4c4e..1b18f8f 100644
--- a/doc/api/schema/PipelineInstance.textile
+++ b/doc/api/schema/PipelineInstance.textile
@@ -2,7 +2,7 @@
 layout: default
 navsection: api
 navmenu: Schema
-title: "Resource: PipelineInstance"
+title: PipelineInstance
 navorder: 16
 ---
 
@@ -12,7 +12,7 @@ A **PipelineInstance** represents...
 
 h2. Methods
 
-See "REST methods for working with Arvados resources":methods.html
+See "REST methods for working with Arvados resources":/api/methods.html
 
 API endpoint base: @https://{{ site.arvados_api_host }}/arvados/v1/pipeline_instance@
 
@@ -28,7 +28,7 @@ Side effects of creating a PipelineInstance.
 
 h2. Resources
 
-Each PipelineInstance has, in addition to the usual "attributes of Arvados resources":resources.html:
+Each PipelineInstance has, in addition to the usual "attributes of Arvados resources":/api/resources.html:
 
 table(table table-bordered table-condensed).
 |*Attribute*|*Type*|*Description*|*Example*|
diff --git a/doc/api/schema/PipelineTemplate.textile b/doc/api/schema/PipelineTemplate.textile
index ac89b6d..3f80fa6 100644
--- a/doc/api/schema/PipelineTemplate.textile
+++ b/doc/api/schema/PipelineTemplate.textile
@@ -2,7 +2,7 @@
 layout: default
 navsection: api
 navmenu: Schema
-title: "Resource: PipelineTemplate"
+title: PipelineTemplate
 navorder: 17
 ---
 
@@ -12,7 +12,7 @@ A **PipelineTemplate** represents...
 
 h2. Methods
 
-See "REST methods for working with Arvados resources":methods.html
+See "REST methods for working with Arvados resources":/api/methods.html
 
 API endpoint base: @https://{{ site.arvados_api_host }}/arvados/v1/pipeline_template@
 
@@ -28,7 +28,7 @@ Side effects of creating a PipelineTemplate.
 
 h2. Resources
 
-Each PipelineTemplate has, in addition to the usual "attributes of Arvados resources":resources.html:
+Each PipelineTemplate has, in addition to the usual "attributes of Arvados resources":/api/resources.html:
 
 table(table table-bordered table-condensed).
 |*Attribute*|*Type*|*Description*|*Example*|
diff --git a/doc/api/schema/Repository.textile b/doc/api/schema/Repository.textile
index 65755dc..e7c6052 100644
--- a/doc/api/schema/Repository.textile
+++ b/doc/api/schema/Repository.textile
@@ -2,7 +2,7 @@
 layout: default
 navsection: api
 navmenu: Schema
-title: "Resource: Repository"
+title: Repository
 navorder: 18
 ---
 
@@ -12,7 +12,7 @@ A **Repository** represents...
 
 h2. Methods
 
-See "REST methods for working with Arvados resources":methods.html
+See "REST methods for working with Arvados resources":/api/methods.html
 
 API endpoint base: @https://{{ site.arvados_api_host }}/arvados/v1/repository@
 
@@ -28,7 +28,7 @@ Side effects of creating a Repository.
 
 h2. Resources
 
-Each Repository has, in addition to the usual "attributes of Arvados resources":resources.html:
+Each Repository has, in addition to the usual "attributes of Arvados resources":/api/resources.html:
 
 table(table table-bordered table-condensed).
 |*Attribute*|*Type*|*Description*|*Example*|
diff --git a/doc/api/schema/Specimen.textile b/doc/api/schema/Specimen.textile
index 5ecb59b..dd75e9e 100644
--- a/doc/api/schema/Specimen.textile
+++ b/doc/api/schema/Specimen.textile
@@ -2,7 +2,7 @@
 layout: default
 navsection: api
 navmenu: Schema
-title: "Resource: Specimen"
+title: Specimen
 navorder: 19
 ---
 
@@ -12,7 +12,7 @@ A **Specimen** represents...
 
 h2. Methods
 
-See "REST methods for working with Arvados resources":methods.html
+See "REST methods for working with Arvados resources":/api/methods.html
 
 API endpoint base: @https://{{ site.arvados_api_host }}/arvados/v1/specimen@
 
@@ -28,7 +28,7 @@ Side effects of creating a Specimen.
 
 h2. Resources
 
-Each Specimen has, in addition to the usual "attributes of Arvados resources":resources.html:
+Each Specimen has, in addition to the usual "attributes of Arvados resources":/api/resources.html:
 
 table(table table-bordered table-condensed).
 |*Attribute*|*Type*|*Description*|*Example*|
diff --git a/doc/api/schema/Trait.textile b/doc/api/schema/Trait.textile
index 9a1b07f..3af0744 100644
--- a/doc/api/schema/Trait.textile
+++ b/doc/api/schema/Trait.textile
@@ -2,7 +2,7 @@
 layout: default
 navsection: api
 navmenu: Schema
-title: "Resource: Trait"
+title: Trait
 navorder: 20
 ---
 
@@ -12,7 +12,7 @@ A **Trait** represents...
 
 h2. Methods
 
-See "REST methods for working with Arvados resources":methods.html
+See "REST methods for working with Arvados resources":/api/methods.html
 
 API endpoint base: @https://{{ site.arvados_api_host }}/arvados/v1/trait@
 
@@ -28,7 +28,7 @@ Side effects of creating a Trait.
 
 h2. Resources
 
-Each Trait has, in addition to the usual "attributes of Arvados resources":resources.html:
+Each Trait has, in addition to the usual "attributes of Arvados resources":/api/resources.html:
 
 table(table table-bordered table-condensed).
 |*Attribute*|*Type*|*Description*|*Example*|
diff --git a/doc/api/schema/User.textile b/doc/api/schema/User.textile
index 2d3445f..4df7a34 100644
--- a/doc/api/schema/User.textile
+++ b/doc/api/schema/User.textile
@@ -2,7 +2,7 @@
 layout: default
 navsection: api
 navmenu: Schema
-title: "Resource: User"
+title: User
 navorder: 21
 ---
 
@@ -12,7 +12,7 @@ A **User** represents...
 
 h2. Methods
 
-See "REST methods for working with Arvados resources":methods.html
+See "REST methods for working with Arvados resources":/api/methods.html
 
 API endpoint base: @https://{{ site.arvados_api_host }}/arvados/v1/user@
 
@@ -28,7 +28,7 @@ Side effects of creating a User.
 
 h2. Resources
 
-Each User has, in addition to the usual "attributes of Arvados resources":resources.html:
+Each User has, in addition to the usual "attributes of Arvados resources":/api/resources.html:
 
 table(table table-bordered table-condensed).
 |*Attribute*|*Type*|*Description*|*Example*|
diff --git a/doc/api/schema/VirtualMachine.textile b/doc/api/schema/VirtualMachine.textile
index 36cde5f..04068a2 100644
--- a/doc/api/schema/VirtualMachine.textile
+++ b/doc/api/schema/VirtualMachine.textile
@@ -2,7 +2,7 @@
 layout: default
 navsection: api
 navmenu: Schema
-title: "Resource: VirtualMachine"
+title: VirtualMachine
 navorder: 22
 ---
 
@@ -12,7 +12,7 @@ A **VirtualMachine** represents...
 
 h2. Methods
 
-See "REST methods for working with Arvados resources":methods.html
+See "REST methods for working with Arvados resources":/api/methods.html
 
 API endpoint base: @https://{{ site.arvados_api_host }}/arvados/v1/virtual_machine@
 
@@ -28,7 +28,7 @@ Side effects of creating a VirtualMachine.
 
 h2. Resources
 
-Each VirtualMachine has, in addition to the usual "attributes of Arvados resources":resources.html:
+Each VirtualMachine has, in addition to the usual "attributes of Arvados resources":/api/resources.html:
 
 table(table table-bordered table-condensed).
 |*Attribute*|*Type*|*Description*|*Example*|
diff --git a/docker/run.sh b/docker/run.sh
index ce822a9..c8ddabe 100755
--- a/docker/run.sh
+++ b/docker/run.sh
@@ -212,7 +212,7 @@ function do_start {
 	make_keep_volumes
 	for v in ${keep_volumes[*]}
 	do
-	    [ -f $v/keep/.metadata.yml ] && rm $v/keep/.metadata.yml
+	    [ -f $v/keep/.metadata.yml ] && sudo rm $v/keep/.metadata.yml
 	done
 	start_container "25107:25107" "keep_server_0" \
 	    "${keep_volumes[0]}:/dev/keep-0" \

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list