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 @@ -102,8 +102,15 @@ different Kubernetes components.
102102| ` LocalStorageCapacityIsolation ` | ` false ` | Alpha | 1.7 | |
103103=======
104104| ` KubeletConfigFile ` | ` false ` | Alpha | 1.8 | 1.9 |
105+ <<<<<<< HEAD
105106| ` LocalStorageCapacityIsolation ` | ` false ` | Alpha | 1.7 | |
106107>>>>>>> Document the removal of the KubeletConfigFile feature gate (#7140 )
108+ ||||||| merged common ancestors
109+ | ` LocalStorageCapacityIsolation ` | ` false ` | Alpha | 1.7 | |
110+ =======
111+ | ` LocalStorageCapacityIsolation ` | ` false ` | Alpha | 1.7 | 1.9 |
112+ | ` LocalStorageCapacityIsolation ` | ` true ` | Beta| 1.10 | |
113+ >>>>>>> Document that LocalStorageCapacityIsolation is beta (#7635 )
107114| ` MountContainers ` | ` false ` | Alpha | 1.9 | |
108115| ` MountPropagation ` | ` false ` | Alpha | 1.8 | 1.9 |
109116| ` MountPropagation ` | ` true ` | Beta | 1.10 | |
You can’t perform that action at this time.
0 commit comments