Merge remote-tracking branch 'remotes/origin/osw' into osw_output

# Conflicts: # spec/schema/osw.json
NREL · Jun 9, 2016 · fa8c2e0 · fa8c2e0
2 parents c2f6ed3 + 4a8883e
commit fa8c2e0
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 32 deletions.
diff --git a/spec/schema/osw.json b/spec/schema/osw.json
@@ -51,33 +51,25 @@
 				"steps": {
 					"$ref": "#/definitions/Workflow Steps"
 				},
+				"file_format_version": {
+					"description": "Currently 0.1, however will infered to be the default of the software package unless otherwise specified",
+					"type": "string"
+				},
 				"osa_id": {
 					"description": "UUID of the .osa file fron which this file was generated, or null if not generated from a .osa file",
-					"type": [
-						"string",
-						"null"
-					]
+					"type": "string"
 				},
 				"osa_checksum": {
 					"description": "Checksum of the .osa file from which this file was generated, or null if not generated from a .osa file",
-					"type": [
-						"number",
-						"null"
-					]
+					"type": "string"
 				},
 				"osd_id": {
 					"description": "UUID of the .osd file from which this file was generated, or null if not generated from a .osd file",
-					"type": [
-						"string",
-						"null"
-					]
+					"type": "string"
 				},
 				"osd_checksum": {
 					"description": "Checksum of the .osd file from which this file was generated, or null if not generated from a .osd file",
-					"type": [
-						"number",
-						"null"
-					]
+					"type": "string"
 				},
 				"created_at": {
 					"$ref": "#/definitions/Timestamp"

diff --git a/spec/schema/osw_output.json b/spec/schema/osw_output.json
@@ -51,33 +51,25 @@
 				"steps": {
 					"$ref": "#/definitions/Workflow Steps"
 				},
+				"file_format_version": {
+					"description": "Currently 0.1, however will infered to be the default of the software package unless otherwise specified",
+					"type": "string"
+				},
 				"osa_id": {
 					"description": "UUID of the .osa file fron which this file was generated, or null if not generated from a .osa file",
-					"type": [
-						"string",
-						"null"
-					]
+					"type": "string"
 				},
 				"osa_checksum": {
 					"description": "Checksum of the .osa file from which this file was generated, or null if not generated from a .osa file",
-					"type": [
-						"number",
-						"null"
-					]
+					"type": "string"
 				},
 				"osd_id": {
 					"description": "UUID of the .osd file from which this file was generated, or null if not generated from a .osd file",
-					"type": [
-						"string",
-						"null"
-					]
+					"type": "string"
 				},
 				"osd_checksum": {
 					"description": "Checksum of the .osd file from which this file was generated, or null if not generated from a .osd file",
-					"type": [
-						"number",
-						"null"
-					]
+					"type": "string"
 				},
 				"created_at": {
 					"$ref": "#/definitions/Timestamp"