From 34eb94424d4b576e0421bf373594c75e1dfecb79 Mon Sep 17 00:00:00 2001 From: devin-donnelly Date: Mon, 12 Dec 2016 13:31:22 -0500 Subject: [PATCH 1/2] Update index.md --- docs/getting-started-guides/windows/index.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docs/getting-started-guides/windows/index.md b/docs/getting-started-guides/windows/index.md index 80e7fc6e14..07f28dca2f 100644 --- a/docs/getting-started-guides/windows/index.md +++ b/docs/getting-started-guides/windows/index.md @@ -1,3 +1,7 @@ +--- + +--- + # Running Windows Server Containers using Kubernetes Kubernetes version 1.5 introduces support for Windows Server Containers. In version 1.5, the Kubernetes control plane (API Server, Scheduler, Controller Manager, etc) continue to run on Linux, while the kubelet and kube-proxy can be run on Windows Server. From 8f0f15e1a1e927f2acf92da0bb1a19ac69d73117 Mon Sep 17 00:00:00 2001 From: devin-donnelly Date: Mon, 12 Dec 2016 13:44:41 -0500 Subject: [PATCH 2/2] Update index.md --- docs/getting-started-guides/windows/index.md | 1 - 1 file changed, 1 deletion(-) diff --git a/docs/getting-started-guides/windows/index.md b/docs/getting-started-guides/windows/index.md index 07f28dca2f..a28e037908 100644 --- a/docs/getting-started-guides/windows/index.md +++ b/docs/getting-started-guides/windows/index.md @@ -2,7 +2,6 @@ --- -# Running Windows Server Containers using Kubernetes Kubernetes version 1.5 introduces support for Windows Server Containers. In version 1.5, the Kubernetes control plane (API Server, Scheduler, Controller Manager, etc) continue to run on Linux, while the kubelet and kube-proxy can be run on Windows Server. **Note:** Windows Server Containers on Kubernetes is an Alpha feature in Kubernetes 1.5.