whentimeslows/website
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Review conflicts from 1.6-release/master merges

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
docs/concepts/overview/what-is-kubernetes.md
+1 -1
View File
@@ -76,7 +76,7 @@ Kubernetes satisfies a number of common needs of applications running in product
* [load balancing](/docs/concepts/services-networking/service/),
* [rolling updates](/docs/tasks/run-application/rolling-update-replication-controller/),
* [resource monitoring](/docs/concepts/cluster-administration/resource-usage-monitoring/),
* [log access and ingestion](/docs/concepts/clusters/logging/),
* [log access and ingestion](/docs/concepts/cluster-administration/logging/),
* [support for introspection and debugging](/docs/tasks/debug-application-cluster/debug-application-introspection/), and
* [identity and authorization](/docs/admin/authorization/).