Review conflicts from 1.6-release/master merges

This commit is contained in:
Andrew Chen
2017-04-20 10:46:59 -07:00
parent 800f1b588d
commit cb9cff59db
5 changed files with 3 additions and 69 deletions
+1 -1
View File
@@ -106,4 +106,4 @@ to pick up the `--runtime-config` changes.
DaemonSets, Deployments, HorizontalPodAutoscalers, Ingress, Jobs and ReplicaSets are enabled by default.
Other extensions resources can be enabled by setting `--runtime-config` on
apiserver. `--runtime-config` accepts comma separated values. For ex: to disable deployments and jobs, set
`--runtime-config=extensions/v1beta1/deployments=false,extensions/v1beta1/jobs=false`
`--runtime-config=extensions/v1beta1/deployments=false,extensions/v1beta1/ingress=false`