summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authork8s-ci-robot <k8s-ci-robot@users.noreply.github.com>2018-05-04 09:37:51 -0700
committerGitHub <noreply@github.com>2018-05-04 09:37:51 -0700
commit69efdb98f89da24c6c355cc43a3360e68c3bdc94 (patch)
tree2edae7b3e5d3ee004ab6db74694f92af064844fc
parent9a2dfc1006a865bf98aeef090d999f02b0c73f78 (diff)
parentf73e75881c81811673dbb7e145625cce78ded14a (diff)
Merge pull request #2129 from AdamDang/patch-6
[cri-windows.md] Typo fix: configration->configuration
-rw-r--r--contributors/design-proposals/node/cri-windows.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/contributors/design-proposals/node/cri-windows.md b/contributors/design-proposals/node/cri-windows.md
index e1a7f1fa..6589d985 100644
--- a/contributors/design-proposals/node/cri-windows.md
+++ b/contributors/design-proposals/node/cri-windows.md
@@ -85,7 +85,7 @@ The implementation will mainly be in two parts:
In both parts, we need to implement:
* Fork code for Windows from Linux.
-* Convert from Resources.Requests and Resources.Limits to Windows configuration in CRI, and convert from Windows configration in CRI to container configuration.
+* Convert from Resources.Requests and Resources.Limits to Windows configuration in CRI, and convert from Windows configuration in CRI to container configuration.
To implement resource controls for Windows containers, refer to [this MSDN documentation](https://docs.microsoft.com/en-us/virtualization/windowscontainers/manage-containers/resource-controls) and [Docker's conversion to OCI spec](https://github.com/moby/moby/blob/master/daemon/oci_windows.go).