Merge branch 'master' into 9998-unsigned_manifest

[arvados.git] / doc / _includes / _container_runtime_constraints.liquid

diff --git a/doc/_includes/_container_runtime_constraints.liquid b/doc/_includes/_container_runtime_constraints.liquid
index 5c86e8fb084d439485ec7b67d10dd6d0193d23f3..849db42e47827c7a3cc2ddea8a28f36d3434979e 100644 (file)
--- a/doc/_includes/_container_runtime_constraints.liquid
+++ b/doc/_includes/_container_runtime_constraints.liquid
@@ -4,6 +4,8 @@ Runtime constraints restrict the container's access to compute resources and the
 
 table(table table-bordered table-condensed).
 |_. Key|_. Type|_. Description|_. Notes|
-|ram|integer|Number of ram bytes to be used to run this process.|Required when in "Committed" state.|
-|vcpus|integer|Number of cores to be used to run this process.|Required when in "Committed" state.|
-|API|boolean|When set, use Crunch2 to run this process.|Optional.|
+|ram|integer|Number of ram bytes to be used to run this process.|Optional. However, a ContainerRequest that is in "Committed" state must provide this.|
+|vcpus|integer|Number of cores to be used to run this process.|Optional. However, a ContainerRequest that is in "Committed" state must provide this.|
+|keep_cache_ram|integer|Number of keep cache bytes to be used to run this process.|Optional.|
+|API|boolean|When set, ARVADOS_API_HOST and ARVADOS_API_TOKEN will be set, and container will have networking enabled to access the Arvados API server.|Optional.|
+|partition|array of strings|Specify the names of one or more compute partitions that may run this container.  If not provided, the system chooses where to run the container.|Optional.|