Merge branch 'master' into master

This commit is contained in:
fbsolo
2016-08-25 13:19:26 -07:00
committed by GitHub
8 changed files with 123 additions and 44 deletions
+1 -1
View File
@@ -116,7 +116,7 @@ rejects, then the request is immediately rejected.
In addition to rejecting objects, admission controllers can also set complex defaults for
fields.
The available Admission Control Modules are described [here](docs/admin/admission-controllers/).
The available Admission Control Modules are described [here](/docs/admin/admission-controllers/).
Once a request passes all admission controllers, it is validated using the validation routines
for the corresponding API object, and then written to the object store (shown as step **4**).
+2 -2
View File
@@ -36,8 +36,8 @@ it to [support other log format](/docs/admin/node-problem/#support-other-log-for
## Enable/Disable in GCE cluster
Node problem detector is running as a cluster
[addon](docs/admin/cluster-large/#addon-resources) enabled by default in the
Node problem detector is [running as a cluster
addon](/docs/admin/cluster-large/#addon-resources) enabled by default in the
gce cluster.
You can enable/disable it by setting the environment variable