github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-26 04:36:00 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #18611 from timstclair/allocatable-impl2

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2016-01-12 22:48:12 -08:00
parent a59be26fb0 e2ffd007f7
commit c475b4ee35
7 changed files with 123 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hack/verify-flags/known-flags.txt
View File

@@ -156,6 +156,7 @@ km-path
kube-api-burst
kube-api-qps
kube-master
kube-reserved
kubectl-path
kubelet-address
kubelet-cadvisor-port
@@ -331,6 +332,7 @@ streaming-connection-idle-timeout
suicide-timeout
sync-frequency
system-container
system-reserved
target-port
tcp-services
terminated-pod-gc-threshold