Skip to content

Commit

Permalink
Merge pull request compose-spec#139 from compose-spec/revert-116-patch-1
Browse files Browse the repository at this point in the history
Revert "Updated memory properties with format byte"
  • Loading branch information
ndeloof committed Feb 8, 2021
2 parents a1e3060 + a5ff83b commit 4fe3986
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions schema/compose-spec.json
Original file line number Diff line number Diff line change
Expand Up @@ -514,7 +514,7 @@
"type": "object",
"properties": {
"cpus": {"type": ["number", "string"]},
"memory": {"type": "string", "format" : "byte"}
"memory": {"type": "string"}
},
"additionalProperties": false,
"patternProperties": {"^x-": {}}
Expand All @@ -523,7 +523,7 @@
"type": "object",
"properties": {
"cpus": {"type": ["number", "string"]},
"memory": {"type": "string", "format": "byte"},
"memory": {"type": "string"},
"generic_resources": {"$ref": "#/definitions/generic_resources"},
"devices": {"$ref": "#/definitions/devices"}
},
Expand Down

0 comments on commit 4fe3986

Please sign in to comment.