From cc2239261fcfd869b777842f36b7e09e0d1e3847 Mon Sep 17 00:00:00 2001
From: Pengfei Ni <feiskyer@users.noreply.github.com>
Date: Sun, 25 Feb 2018 01:49:46 +0800
Subject: [PATCH] Add HyperVContainer feature gates (#7502)

---
 docs/reference/feature-gates.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/docs/reference/feature-gates.md b/docs/reference/feature-gates.md
index fd0c281a26..69f11b255a 100644
--- a/docs/reference/feature-gates.md
+++ b/docs/reference/feature-gates.md
@@ -74,7 +74,12 @@ different Kubernetes components.
 =======
 | `HugePages` | `false` | Alpha | 1.8 | 1.9 |
 | `HugePages` | `true` | Beta| 1.10 | |
+<<<<<<< HEAD
 >>>>>>> Document that HugePages feature gate is Beta (#7387)
+||||||| merged common ancestors
+=======
+| `HyperVContainer` | `false` | Alpha | 1.10 | |
+>>>>>>> Add HyperVContainer feature gates (#7502)
 | `Initializers` | `false` | Alpha | 1.7 | |
 <<<<<<< HEAD
 | `KubeletConfigFile` | `false` | Alpha | 1.8 | 1.9 |