File tree 1 file changed +7
-0
lines changed
1 file changed +7
-0
lines changed Original file line number Diff line number Diff line change @@ -133,9 +133,16 @@ different Kubernetes components.
133
133
| ` PersistentLocalVolumes ` | ` true ` | Beta | 1.10 | |
134
134
>>>>>>> Update feature gates move to beta (#7662 )
135
135
| ` PodPriority ` | ` false ` | Alpha | 1.8 | |
136
+ <<<<<<< HEAD
136
137
| ` PodShareProcessNamespace ` | ` false ` | Alpha | 1.10 | |
137
138
| ` PVCProtection ` | ` false ` | Alpha | 1.9 | 1.9 |
138
139
| ` 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 )
139
146
| ` ResourceLimitsPriorityFunction ` | ` false ` | Alpha | 1.9 | |
140
147
| ` RotateKubeletClientCertificate ` | ` true ` | Beta | 1.7 | |
141
148
| ` RotateKubeletServerCertificate ` | ` false ` | Alpha | 1.7 | |
You can’t perform that action at this time.
0 commit comments