Merge pull request #1157 from fbsolo/master

PR for Kubernetes.io Dead Link Report (generated 8-22): items 5 and 6
This commit is contained in:
Jared
2016-09-06 17:19:03 -07:00
committed by GitHub
2 changed files with 2 additions and 3 deletions
+1 -1
View File
@@ -160,7 +160,7 @@ Lars Kellogg-Stedman.
### Weave Net from Weaveworks
[Weave Net](https://www.weave.works/documentation/net-1-6-0-introducing-weave/) is a
[Weave Net](https://www.weave.works/products/weave-net/) is a
resilient and simple to use network for Kubernetes and its hosted applications.
Weave Net runs as a [CNI plug-in](https://www.weave.works/docs/net/latest/cni-plugin/)
or stand-alone. In either version, it doesnt require any configuration or extra code
+1 -2
View File
@@ -36,8 +36,7 @@ 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](cluster-large.md/#Addon-Resources) enabled by default in the
gce cluster.
You can enable/disable it by setting the environment variable