Skip to content

Commit

Permalink
Merge branch 'update/SOF-6328' of github.com:Exabyte-io/exabyte-mater…
Browse files Browse the repository at this point in the history
…ials-json into update/SOF-6182
  • Loading branch information
k0stik committed Oct 12, 2022
2 parents 509618b + fc85779 commit 9745f43
Show file tree
Hide file tree
Showing 7 changed files with 10 additions and 10 deletions.
4 changes: 4 additions & 0 deletions example/properties/best.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"count": 2,
"...": "include(refined.json)"
}
4 changes: 0 additions & 4 deletions example/properties/best_property.json

This file was deleted.

File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@
"value" : 10,
"metric" : "KPPRA"
},
"...": "include(raw_property.json)"
"...": "include(raw.json)"
}
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"schemaId": "properties/best-property",
"schemaId": "properties/best",
"$schema": "http://json-schema.org/draft-04/schema#",
"title": "Schema of material's best properties",
"allOf": [
{
"$ref": "refined_property.json"
"$ref": "refined.json"
}
],
"properties": {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"schemaId": "properties/raw-property",
"schemaId": "properties/raw",
"$schema": "http://json-schema.org/draft-04/schema#",
"title": "Schema of material's preliminary property",
"allOf": [
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"schemaId": "properties/refined-property",
"schemaId": "properties/refined",
"$schema": "http://json-schema.org/draft-04/schema#",
"title": "Schema of material's property",
"allOf": [
{
"$ref": "raw_property.json"
"$ref": "raw.json"
}
],
"properties": {
Expand Down

0 comments on commit 9745f43

Please sign in to comment.