From 678ede6e859118dfde51c7a3b681b913ff197336 Mon Sep 17 00:00:00 2001 From: Lee Verberne Date: Sat, 10 Mar 2018 09:50:11 +0100 Subject: [PATCH] Create a task describing Pod process namespace sharing (#7489) --- docs/reference/feature-gates.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/docs/reference/feature-gates.md b/docs/reference/feature-gates.md index 63375bddcb84b..8892faa2d8ee9 100644 --- a/docs/reference/feature-gates.md +++ b/docs/reference/feature-gates.md @@ -133,9 +133,16 @@ different Kubernetes components. | `PersistentLocalVolumes` | `true` | Beta | 1.10 | | >>>>>>> Update feature gates move to beta (#7662) | `PodPriority` | `false` | Alpha | 1.8 | | +<<<<<<< HEAD | `PodShareProcessNamespace` | `false` | Alpha | 1.10 | | | `PVCProtection` | `false` | Alpha | 1.9 | 1.9 | | `ReadOnlyAPIDataVolumes` | `true` | Deprecated | 1.10 | | +||||||| merged common ancestors +| `PVCProtection` | `false` | Alpha | 1.9 | | +======= +| `PodShareProcessNamespace` | `false` | Alpha | 1.10 | | +| `PVCProtection` | `false` | Alpha | 1.9 | | +>>>>>>> Create a task describing Pod process namespace sharing (#7489) | `ResourceLimitsPriorityFunction` | `false` | Alpha | 1.9 | | | `RotateKubeletClientCertificate` | `true` | Beta | 1.7 | | | `RotateKubeletServerCertificate` | `false` | Alpha | 1.7 | |