Update the 'upgrading' documentation to reflect the v1.4.0 release, and warn

[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..7e0c8f18f27910cd146742467a7d38feed39b428 100644 (file)
--- a/doc/_includes/_container_runtime_constraints.liquid
+++ b/doc/_includes/_container_runtime_constraints.liquid
@@ -1,9 +1,16 @@
-Runtime constraints
+{% comment %}
+Copyright (C) The Arvados Authors. All rights reserved.
+
+SPDX-License-Identifier: CC-BY-SA-3.0
+{% endcomment %}
+
+h2. Runtime constraints
 
 Runtime constraints restrict the container's access to compute resources and the outside world (in addition to its explicitly stated inputs and output).
 
 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.|