Document that LocalStorageCapacityIsolation is beta (#7635)

A follow-up to the kubernetes/kubernetes#60159 change which has promoted the `LocalStorageCapacityIsolation` feature gate to Beta.
kubernetes · Apr 16, 2018 · 08d63f2 · 08d63f2
1 parent 3385527
commit 08d63f2
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/docs/reference/feature-gates.md b/docs/reference/feature-gates.md
@@ -102,8 +102,15 @@ different Kubernetes components.
 | `LocalStorageCapacityIsolation` | `false` | Alpha | 1.7 | |
 =======
 | `KubeletConfigFile` | `false` | Alpha | 1.8 | 1.9 |
+<<<<<<< HEAD
 | `LocalStorageCapacityIsolation` | `false` | Alpha | 1.7 | |
 >>>>>>> Document the removal of the KubeletConfigFile feature gate (#7140)
+||||||| merged common ancestors
+| `LocalStorageCapacityIsolation` | `false` | Alpha | 1.7 | |
+=======
+| `LocalStorageCapacityIsolation` | `false` | Alpha | 1.7 | 1.9 |
+| `LocalStorageCapacityIsolation` | `true` | Beta| 1.10 | |
+>>>>>>> Document that LocalStorageCapacityIsolation is beta (#7635)
 | `MountContainers` | `false` | Alpha | 1.9 | |
 | `MountPropagation` | `false` | Alpha | 1.8 | 1.9 |
 | `MountPropagation` | `true` | Beta | 1.10 | |