From fbccdc2618b0651ddd727370c8ab9894abbe91e8 Mon Sep 17 00:00:00 2001 From: Qiming Date: Sun, 25 Feb 2018 01:33:45 +0800 Subject: [PATCH] Document that HugePages feature gate is Beta (#7387) The `HugePages` feature gate has graduated to Beta in v1.10. This PR documents this fact. --- docs/reference/feature-gates.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/docs/reference/feature-gates.md b/docs/reference/feature-gates.md index 012a847f85..fd0c281a26 100644 --- 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 |