jasder
/
runc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #551 from wking/schema-format 

schema: Run 'make fmt'
This commit is contained in:
Michael Crosby 2016-08-31 09:41:00 -07:00 committed by GitHub
parent b860409a5a 90be62f150
commit d3c3763b9f
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
schema/config-linux.json
View File

@ -202,8 +202,7 @@
"id": "https://opencontainers.org/schema/bundle/linux/resources/cpu/shares", "id": "https://opencontainers.org/schema/bundle/linux/resources/cpu/shares",
"$ref": "defs.json#/definitions/uint64Pointer" "$ref": "defs.json#/definitions/uint64Pointer"
} }
}, }
"type": "object"
}, },
"disableOOMKiller": { "disableOOMKiller": {
"id": "https://opencontainers.org/schema/bundle/linux/resources/disableOOMKiller", "id": "https://opencontainers.org/schema/bundle/linux/resources/disableOOMKiller",

2
schema/defs.json
View File

@ -41,7 +41,7 @@
"minimum": 0, "minimum": 0,
"maximum": 18446744073709552000 "maximum": 18446744073709552000
}, },
"intPointer" : { "intPointer": {
"oneOf": [ "oneOf": [
{ {
"type": "integer" "type": "integer"