Merge commit '240a3968549c321b43e2375c3078a6c6677dc6d1' into resource-requirement

Author: Peter Amstutz

cwltool/schemas/draft-3/cwl-avro.yml

@@ -363,6 +363,11 @@
           the designated temporary directory that will be used when executing
           the tool.  Null if not applicable.
 
+        - **resources**: When used in the context of a CommandLineTool, an object
+          describing the resources allocated to run the tool.  These fields are "cores",
+          "ram", "tmpdir", "outdir".  See ResourceRequirement for details.
+
+
       * On standard output, print a single JSON value (string, number, array, object,
         boolean, or null) for the return value.
 
@@ -2102,4 +2107,4 @@
 
     - name: outdirMax
       type: ["null", long, string, "#Expression"]
-      doc: Maximum reserved filesystem based storage for the designated output directory, in mebibytes (2**20)
+      doc: Maximum reserved filesystem based storage for the designated output directory, in mebibytes (2**20)