From 2a5b95ef9df02b017f298c3afb94203f23d0b397 Mon Sep 17 00:00:00 2001
From: Luka Stojanovic <luka.stojanovic@sbgenomics.com>
Date: Tue, 25 Oct 2016 03:27:50 +0200
Subject: [PATCH 1/2] fixing mentions to draft3/4

---
 v1.0/concepts.md      | 2 +-
 v1.0/salad/README.rst | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/v1.0/concepts.md b/v1.0/concepts.md
index 773feb533..cc4df5ae2 100644
--- a/v1.0/concepts.md
+++ b/v1.0/concepts.md
@@ -89,7 +89,7 @@ preprocessing steps described in the
 [Semantic Annotations for Linked Avro Data (SALAD) Specification](SchemaSalad.html).
 An implementation may formally validate the structure of a CWL document using
 SALAD schemas located at
-https://github.com/common-workflow-language/common-workflow-language/tree/master/draft-4
+https://github.com/common-workflow-language/common-workflow-language/tree/master/v1.0
 
 ## Identifiers
 
diff --git a/v1.0/salad/README.rst b/v1.0/salad/README.rst
index 11d1b06b6..e66427cdd 100644
--- a/v1.0/salad/README.rst
+++ b/v1.0/salad/README.rst
@@ -70,6 +70,6 @@ provides for robust support of inline documentation.
 .. _JSON-LD: http://json-ld.org
 .. _Avro: http://avro.apache.org
 .. _metaschema: https://github.com/common-workflow-language/schema_salad/blob/master/schema_salad/metaschema/metaschema.yml
-.. _specification: http://www.commonwl.org/draft-3/SchemaSalad.html
-.. _Language: https://github.com/common-workflow-language/common-workflow-language/blob/master/draft-3/CommandLineTool.yml
+.. _specification: http://www.commonwl.org/v1.0/SchemaSalad.html
+.. _Language: https://github.com/common-workflow-language/common-workflow-language/blob/master/v1.0/CommandLineTool.yml
 .. _RDF: https://www.w3.org/RDF/

From d906c4adac2cb366d3567a9c2882a2691482f09a Mon Sep 17 00:00:00 2001
From: Luka Stojanovic <luka.stojanovic@sbgenomics.com>
Date: Tue, 1 Nov 2016 19:11:00 +0100
Subject: [PATCH 2/2] dir4 test fix

---
 v1.0/conformance_test_v1.0.yaml | 8 ++++----
 v1.0/v1.0/dir4.cwl              | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/v1.0/conformance_test_v1.0.yaml b/v1.0/conformance_test_v1.0.yaml
index 365e752f4..8d5a61b9b 100644
--- a/v1.0/conformance_test_v1.0.yaml
+++ b/v1.0/conformance_test_v1.0.yaml
@@ -789,10 +789,10 @@
 - job: v1.0/dir4-job.yml
   output: {
     "outlist": {
-        "checksum": "sha1$2ab6f189e84753c05a23413fbf6b6fbf4c53489f",
-        "size": 90,
-        "location": "output.txt",
-        "class": "File"
+      "checksum": "sha1$13cda8661796ae241da3a18668fb552161a72592",
+      "size": 20,
+      "location": "output.txt",
+      "class": "File"
     }
   }
   tool: v1.0/dir4.cwl
diff --git a/v1.0/v1.0/dir4.cwl b/v1.0/v1.0/dir4.cwl
index 1e3e862a5..a585d98ad 100644
--- a/v1.0/v1.0/dir4.cwl
+++ b/v1.0/v1.0/dir4.cwl
@@ -9,9 +9,9 @@ outputs:
     type: File
     outputBinding:
       glob: output.txt
-arguments: ["cd", "$(inputs.inf.dirname)",
+arguments: ["cd", "$(inputs.inf.dirname)/xtestdir",
   {shellQuote: false, valueFrom: "&&"},
   "find", ".",
   {shellQuote: false, valueFrom: "|"},
   "sort"]
-stdout: output.txt
\ No newline at end of file
+stdout: output.txt