Savitha Raghunathan 95c94c03d5 resolving conflicts		2020-08-23 12:13:37 -04:00
..
architecture	Update links to k8s control plane and k8s objects on controller page	2020-08-21 12:08:05 -07:00
cluster-administration	resolving conflicts	2020-08-23 12:13:37 -04:00
configuration	resolving conflicts	2020-08-23 12:13:37 -04:00
containers	Merge pull request #23130 from DirtySoc/patch-1	2020-08-18 14:31:11 -07:00
extend-kubernetes	resolving conflicts	2020-08-23 12:13:37 -04:00
overview	Fix links in concepts section (2)	2020-08-02 09:11:14 +08:00
policy	Merge remote-tracking branch 'upstream/master' into dev-1.19	2020-08-03 16:09:39 -04:00
scheduling-eviction	Merge remote-tracking branch 'upstream/master' into dev-1.19	2020-08-03 16:09:39 -04:00
security	resolving conflicts	2020-08-23 12:13:37 -04:00
services-networking	Merge pull request #23084 from robscott/endpointslice-duplication	2020-08-21 04:33:39 -07:00
storage	resolving conflicts	2020-08-23 12:13:37 -04:00
workloads	resolving conflicts	2020-08-23 12:13:37 -04:00
_index.md	Add descriptions to Concept sections	2020-06-25 17:09:58 +01:00