Skip to content

Commit 6bace2f

Browse files
tengqmzacharysarah
authored andcommitted
Document the removal of Accelerators feature gate (#7389)
The `Accelerators` feature gate will be removed in 1.11. 1.10 will be its last mile. References: kubernetes/kubernetes#57384
1 parent 57b86bc commit 6bace2f

File tree

1 file changed

+8
-0
lines changed

1 file changed

+8
-0
lines changed

docs/reference/feature-gates.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,16 @@ different Kubernetes components.
2525

2626
| Feature | Default | Stage | Since | Until |
2727
|---------|---------|-------|-------|-------|
28+
<<<<<<< HEAD
2829
| `Accelerators` | `false` | Alpha | 1.6 | 1.10 |
2930
| `AdvancedAuditing` | `false` | Alpha | 1.7 | 1.7 |
31+
||||||| merged common ancestors
32+
| `Accelerators` | `false` | Alpha | 1.6 | |
33+
| `AdvancedAuditing` | `false` | Alpha | 1.7 | |
34+
=======
35+
| `Accelerators` | `false` | Alpha | 1.6 | 1.10 |
36+
| `AdvancedAuditing` | `false` | Alpha | 1.7 | |
37+
>>>>>>> Document the removal of Accelerators feature gate (#7389)
3038
| `AdvancedAuditing` | `true` | Beta | 1.8 | |
3139
| `AffinityInAnnotations` | `false` | Alpha | 1.6 | 1.7 |
3240
| `AllowExtTrafficLocalEndpoints` | `false` | Beta | 1.4 | 1.6 |

0 commit comments

Comments
 (0)