website/docs
Andrew Chen 9886f27a2e Merge branch 'master' of https://github.com/kubernetes/kubernetes.github.io into release-1.6
* 'master' of https://github.com/kubernetes/kubernetes.github.io: (62 commits)
  Move Guide topic: Admin Guide
  Move Guide topic: Resource Monitoring. (#2895)
  Move Guide topic: Service. (#2891)
  Move Guide topic: Connecting Apps with Services. (#2885)
  Move Guide topic: Federation Service Discovery. (#2884)
  Move Guide topic: Config Provider Firewalls. (#2883)
  Move Guide topic: Kubeconfig File
  Move Accessing Clusters topic to Concepts. (#2875)
  Move Guide topic: Sharing Clusters
  Move Guide topic: Prereqs
  Move Garbage Collection topic. (#2874)
  Move PetSets topic. (#2873)
  Move Guide topic: Pod Templates (#2872)
  Move StatefulSets topic. (#2869)
  Rename /docs/tasks/job/work-queue-1/
  Move Guide topic: Fine Parallel Processing using a Work Queue (#2870)
  Move Guide topic: Coarse Parallel Processing Using a Work Queue
  Move Init Containers topic. (#2866)
  Move Guide topic: Parallel Processing using Expansions (#2867)
  Move Pod overview. (#2865)
  ...

# Conflicts:
#	docs/api.md
#	docs/user-guide/jobs.md
2017-03-17 17:33:48 -07:00
..
admin Merge branch 'master' of https://github.com/kubernetes/kubernetes.github.io into release-1.6 2017-03-17 17:33:48 -07:00
api-reference fix some wrong links 2017-02-23 16:08:38 +08:00
concepts Move Guide topic: Resource Monitoring. (#2895) 2017-03-17 10:35:08 -07:00
contribute Update review-issues.md 2017-02-23 15:30:47 +08:00
federation/api-reference fix some wrong links 2017-02-23 16:08:38 +08:00
getting-started-guides Merge branch 'master' of https://github.com/kubernetes/kubernetes.github.io into release-1.6 2017-03-17 17:33:48 -07:00
resources-reference/v1.5 fix some wrong links 2017-02-23 16:08:38 +08:00
tasks Merge branch 'master' of https://github.com/kubernetes/kubernetes.github.io into release-1.6 2017-03-17 17:33:48 -07:00
tools Merge branch 'master' into add_kubeadm_to_tools 2017-01-26 14:04:51 -08:00
tutorials Move Guide topic: Prereqs 2017-03-16 14:53:31 -07:00
user-guide Merge branch 'master' of https://github.com/kubernetes/kubernetes.github.io into release-1.6 2017-03-17 17:33:48 -07:00
api.md Move Kubernetes API page. (#2849) 2017-03-15 17:07:34 -07:00
deprecation-policy.md fix typo 2017-02-23 15:30:47 +08:00
index.md Add docs for Kargo installer for Kubernetes 2017-01-24 14:36:15 -08:00
reference.md Use {{page.version}} instead of hard-coded release number 2017-01-17 17:00:43 -08:00
reporting-security-issues.md Merge pull request #1819 from philips/security 2016-12-22 18:50:51 -08:00
samples.md add explicit titles to docs 2016-12-15 15:16:54 -05:00
search.md Update search.md 2016-03-11 08:05:18 +00:00
sitemap.md Refactor of template demo instructions 2016-06-26 00:17:59 -07:00
troubleshooting.md fix typos 2016-12-28 17:48:46 +08:00
whatisk8s.md Move What is Kubernetes topic. (#2851) 2017-03-15 17:21:06 -07:00