File tree Expand file tree Collapse file tree 1 file changed +8
-0
lines changed Expand file tree Collapse file tree 1 file changed +8
-0
lines changed Original file line number Diff line number Diff 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 | 
 
 
   
 
     
   
   
          
    
    
     
    
      
     
     
    You can’t perform that action at this time.
  
 
    
  
    
      
        
     
       
      
     
   
 
    
    
  
 
  
 
     
    
0 commit comments