Document that HugePages feature gate is Beta (#7387)

The `HugePages` feature gate has graduated to Beta in v1.10. This PR documents this fact.
kubernetes · Apr 16, 2018 · fbccdc2 · fbccdc2
1 parent 8047477
commit fbccdc2
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/docs/reference/feature-gates.md b/docs/reference/feature-gates.md
@@ -64,10 +64,17 @@ different Kubernetes components.
 | `ExpandPersistentVolumes` | `false` | Alpha | 1.8 | 1.8 |
 | `ExperimentalCriticalPodAnnotation` | `false` | Alpha | 1.5 | |
 | `ExperimentalHostUserNamespaceDefaulting` | `false` | Beta | 1.5 | |
+<<<<<<< HEAD
 | `GCERegionalPersistentDisk` | `true` | Beta | 1.10 | |
 | `HugePages` | `false` | Alpha | 1.8 | 1.9 |
 | `HugePages` | `true` | Beta| 1.10 | |
 | `HyperVContainer` | `false` | Alpha | 1.10 | |
+||||||| merged common ancestors
+| `HugePages` | `false` | Alpha | 1.8 | |
+=======
+| `HugePages` | `false` | Alpha | 1.8 | 1.9 |
+| `HugePages` | `true` | Beta| 1.10 | |
+>>>>>>> Document that HugePages feature gate is Beta (#7387)
 | `Initializers` | `false` | Alpha | 1.7 | |
 <<<<<<< HEAD
 | `KubeletConfigFile` | `false` | Alpha | 1.8 | 1.9 |