github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-05 23:47:50 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #15775 from mesosphere/sur-k8sm-482-resource-roles

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2015-12-01 05:36:52 -08:00
parent a836b1e261 9eae47c6e6
commit 7644d34759
46 changed files with 2615 additions and 936 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,7 +1,6 @@
accept-hosts
accept-paths
account-for-pod-resources
admission-control
admission-control-config-file
advertise-address
@@ -192,8 +191,8 @@ mesos-executor-cpus
mesos-executor-mem
mesos-launch-grace-period
mesos-master
mesos-role
mesos-sandbox-overlay
mesos-roles
mesos-user
minimum-container-ttl-duration
minion-max-log-age