Skip to content

schema: bug fixes #784

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
crosbymichael merged 2 commits into from
May 9, 2017
Merged

schema: bug fixes #784

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
79494b2
schema: Fix the error
Apr 27, 2017
11d1ae7
schema: Format fix
Apr 27, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion schema/config-linux.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
},
"oomScoreAdj": {
"id": "https://opencontainers.org/schema/bundle/linux/resources/oomScoreAdj",
"type": "integer",
"type": "integer"
},
"pids": {
"id": "https://opencontainers.org/schema/bundle/linux/resources/pids",
Expand Down
2 changes: 1 addition & 1 deletion schema/config-windows.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
},
"shares": {
"id": "https://opencontainers.org/schema/bundle/windows/resources/cpu/shares",
"$ref": "defs-windows.json#/definitions/cpuShares"
"$ref": "defs.json#/definitions/uint16"
Copy link
Contributor

@wking wking Apr 27, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You may want to wait on #777 before removing cpuShares, because the Windows folks are sounding like they'd like to return the explicit ranges to their settings (here and here).

},
"percent": {
"id": "https://opencontainers.org/schema/bundle/windows/resources/cpu/percent",
Expand Down
2 changes: 1 addition & 1 deletion schema/defs-linux.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@
}
},
"blkioWeight": {
"type": "integer",
"type": "integer"
},
"blockIODevice": {
"type": "object",
Expand Down
8 changes: 0 additions & 8 deletions schema/defs-windows.json
View file
Open in desktop

This file was deleted.