File tree Expand file tree Collapse file tree 1 file changed +7
-0
lines changed
Expand file tree Collapse file tree 1 file changed +7
-0
lines changed Original file line number Diff line number Diff line change @@ -133,9 +133,16 @@ different Kubernetes components.
133133| ` PersistentLocalVolumes ` | ` true ` | Beta | 1.10 | |
134134>>>>>>> Update feature gates move to beta (#7662 )
135135| ` PodPriority ` | ` false ` | Alpha | 1.8 | |
136+ <<<<<<< HEAD
136137| ` PodShareProcessNamespace ` | ` false ` | Alpha | 1.10 | |
137138| ` PVCProtection ` | ` false ` | Alpha | 1.9 | 1.9 |
138139| ` ReadOnlyAPIDataVolumes ` | ` true ` | Deprecated | 1.10 | |
140+ ||||||| merged common ancestors
141+ | ` PVCProtection ` | ` false ` | Alpha | 1.9 | |
142+ =======
143+ | ` PodShareProcessNamespace ` | ` false ` | Alpha | 1.10 | |
144+ | ` PVCProtection ` | ` false ` | Alpha | 1.9 | |
145+ >>>>>>> Create a task describing Pod process namespace sharing (#7489 )
139146| ` ResourceLimitsPriorityFunction ` | ` false ` | Alpha | 1.9 | |
140147| ` RotateKubeletClientCertificate ` | ` true ` | Beta | 1.7 | |
141148| ` RotateKubeletServerCertificate ` | ` false ` | Alpha | 1.7 | |
You can’t perform that action at this time.
0 commit comments