Update dry run feature to beta (kubernetes#11140)

neolit123 · Dec 2, 2018 · b890de3 · b890de3
1 parent a83f118
commit b890de3
Showing 1 changed file with 0 additions and 6 deletions.
diff --git a/content/en/docs/reference/command-line-tools-reference/feature-gates.md b/content/en/docs/reference/command-line-tools-reference/feature-gates.md
@@ -43,10 +43,7 @@ different Kubernetes components.
 | `BlockVolume` | `false` | Alpha | 1.9 | |
 | `BlockVolume` | `true` | Beta | 1.13 | - |
 | `BoundServiceAccountTokenVolume` | `false` | Alpha | 1.13 | |
-<<<<<<< HEAD
 | `CPUCFSQuotaPeriod` | `false` | Alpha | 1.12 | |
-=======
->>>>>>> update new feature gates to document (#11295)
 | `CPUManager` | `false` | Alpha | 1.8 | 1.9 |
 | `CPUManager` | `true` | Beta | 1.10 | |
 | `CRIContainerLogRotation` | `false` | Alpha | 1.10 | 1.10 |
@@ -201,10 +198,7 @@ Each feature gate is designed for enabling/disabling a specific feature:
    ServiceAccountTokenVolumeProjection.
    Check [Service Account Token Volumes](https://git.k8s.io/community/contributors/design-proposals/storage/svcacct-token-volume-source.md)
    for more details.
-<<<<<<< HEAD
 - `CPUCFSQuotaPeriod`: Enable nodes to change CPUCFSQuotaPeriod.
-=======
->>>>>>> update new feature gates to document (#11295)
 - `CPUManager`: Enable container level CPU affinity support, see [CPU Management Policies](/docs/tasks/administer-cluster/cpu-management-policies/).
 - `CRIContainerLogRotation`: Enable container log rotation for cri container runtime.
 - `CSIBlockVolume`: Enable external CSI volume drivers to support block storage. See the [`csi` raw block volume support](/docs/concepts/storage/volumes/#csi-raw-block-volume-support) documentation for more details.