Create a task describing Pod process namespace sharing (#7489)

kubernetes · Apr 16, 2018 · 678ede6 · 678ede6
1 parent 2ad5d12
commit 678ede6
Showing 1 changed file with 7 additions and 0 deletions.
diff --git 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 | |