Merge pull request opencontainers#788 from darrenstahlmsft/RemoveRese…

…rvation Remove Memory reservation on Windows
wking · May 9, 2017 · 101e6f9 · 101e6f9
2 parents d42f1eb + aaed975
commit 101e6f9
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 10 deletions.
diff --git a/config-windows.md b/config-windows.md
@@ -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
             }
         }
     }

diff --git a/schema/config-windows.json b/schema/config-windows.json
@@ -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"
                             }
                         }
                     },

diff --git a/specs-go/config.go b/specs-go/config.go
@@ -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.