Merge pull request #788 from darrenstahlmsft/RemoveReservation

Remove Memory reservation on Windows
This commit is contained in:
Qiang Huang 2017-05-09 09:55:14 +08:00 committed by GitHub
commit 101e6f9d5c
3 changed files with 1 additions and 10 deletions

View File

@ -15,16 +15,13 @@ The following parameters can be specified:
* **`limit`** *(uint64, OPTIONAL)* - sets limit of memory usage in bytes.
* **`reservation`** *(uint64, OPTIONAL)* - sets the guaranteed minimum amount of memory for a container in bytes.
#### Example
```json
"windows": {
"resources": {
"memory": {
"limit": 2097152,
"reservation": 524288
"limit": 2097152
}
}
}

View File

@ -15,10 +15,6 @@
"limit": {
"id": "https://opencontainers.org/schema/bundle/windows/resources/memory/limit",
"$ref": "defs.json#/definitions/uint64"
},
"reservation": {
"id": "https://opencontainers.org/schema/bundle/windows/resources/memory/reservation",
"$ref": "defs.json#/definitions/uint64"
}
}
},

View File

@ -450,8 +450,6 @@ type WindowsResources struct {
type WindowsMemoryResources struct {
// Memory limit in bytes.
Limit *uint64 `json:"limit,omitempty"`
// Memory reservation in bytes.
Reservation *uint64 `json:"reservation,omitempty"`
}
// WindowsCPUResources contains CPU resource management settings.