Skip to content

Commit 901ea7c

Browse files
author
Peter Amstutz
committed
Merge branch 'master' into userguide-1.0
2 parents 156d28f + 8d0fe99 commit 901ea7c

34 files changed

+439
-323
lines changed

draft-3/Workflow.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -378,8 +378,8 @@ $graph:
378378
extends: "#Process"
379379
documentRoot: true
380380
specialize:
381-
specializeFrom: "#OutputParameter"
382-
specializeTo: "#WorkflowOutputParameter"
381+
- specializeFrom: "#OutputParameter"
382+
specializeTo: "#WorkflowOutputParameter"
383383
doc: |
384384
A workflow describes a set of **steps** and the **dependencies** between
385385
those processes. When a process produces output that will be consumed by a

draft-3/salad/schema_salad/metaschema/metaschema.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -302,8 +302,8 @@ $graph:
302302
extends: ["#NamedType", "#RecordSchema", "#SchemaDefinedType"]
303303
documentRoot: true
304304
specialize:
305-
specializeFrom: "#RecordField"
306-
specializeTo: "#SaladRecordField"
305+
- specializeFrom: "#RecordField"
306+
specializeTo: "#SaladRecordField"
307307
fields:
308308
- name: abstract
309309
type: ["null", boolean]

0 commit comments

Comments
 (0)