[ARVADOS] updated: fd4efd53d8510f7d5662d895f8a79ae3ab573b8b

[git at public.curoverse.com]

Summary of changes:
 doc/api/schema/Job.html.textile.liquid | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

       via  fd4efd53d8510f7d5662d895f8a79ae3ab573b8b (commit)
      from  47042547e7873d63f764e85ace085a8da314afd3 (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 fd4efd53d8510f7d5662d895f8a79ae3ab573b8b
Author: Brett Smith <brett at curoverse.com>
Date:   Thu Jun 19 16:39:34 2014 -0400

    Make Job runtime constraints documentation up-to-date.
    
    Refs #2879, #2880.

diff --git a/doc/api/schema/Job.html.textile.liquid b/doc/api/schema/Job.html.textile.liquid
index 097d0df..513c105 100644
--- a/doc/api/schema/Job.html.textile.liquid
+++ b/doc/api/schema/Job.html.textile.liquid
@@ -50,9 +50,11 @@ h3. Runtime constraints
 
 table(table table-bordered table-condensed).
 |_. Key|_. Type|_. Description|_. Implemented|
-|docker_image|string|The name of a Docker image that this Job needs to run.  If specified, Crunch will create a Docker container from this image, and run the Job's script inside that.  The Keep mount and work directories will be available as volumes inside this container.  You may specify the image in any format that Docker accepts, such as "arvados/jobs" or a hash identifier.  If you specify a name, Crunch will try to install the latest version using @docker.io pull at .|✓|
+|docker_image|string|The Docker image that this Job needs to run.  If specified, Crunch will create a Docker container from this image, and run the Job's script inside that.  The Keep mount and work directories will be available as volumes inside this container.  The image must be uploaded to Arvados using @arv keep docker at .  You may specify the image in any format that Docker accepts, such as @arvados/jobs@, @debian:latest@, or the Docker image id.  Alternatively, you may specify the UUID of the image Collection, returned by @arv keep docker at .|✓|
 |min_nodes|integer||✓|
 |max_nodes|integer|||
+|min_cores_per_node|integer|Require that each node assigned to this Job have the specified number of CPU cores|✓|
+|min_ram_mb_per_node|integer|Require that each node assigned to this Job have the specified amount of real memory (in MiB)|✓|
+|min_scratch_mb_per_node|integer|Require that each node assigned to this Job have the specified amount of scratch storage available (in MiB)|✓|
 |max_tasks_per_node|integer|Maximum simultaneous tasks on a single node|✓|
 |min_ram_per_task|integer|Minimum real memory (KiB) per task||
-|min_ram_per_node|integer|Minimum real memory (KiB) per node||

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


hooks/post-receive
--