Commit Graph

63 Commits (ecf9025d3020f28fbf9a635af8167398e4c4aa78)

Author SHA1 Message Date
Maciej Szulik c4dca21649 New deployments endpoint (#2986)
* Update deployments for 1.6

* Update all deployments in docs to use the new endpoint
2017-03-24 11:03:01 -07:00
Andrew Chen 7215af010f Merge branches 'release-1.6' and 'master' of https://github.com/kubernetes/kubernetes.github.io into release-1.6
* 'release-1.6' of https://github.com/kubernetes/kubernetes.github.io:

* 'master' of https://github.com/kubernetes/kubernetes.github.io: (23 commits)
  Apply changes from PR #2787
  rephrase the sentence to make expression clear (#2789)
  update index.md (#2788)
  Apply changes from PR #2784 (#2950)
  The link URL of  [kube-controller-manager] is wrong
  Added pod name in run command
  Fix grammar in docs/admin/daemon.md
  update index.md (#2755)
  Update garbage-collection.md (#2732)
  Fix typo (#2842)
  Fix typo
  Fix the typos
  Apply typo fixes from #2791 (#2949)
  Fix typo in kubectl_completion.md
  fix typeo (#2856)
  Use kubectl config current-context to simplify the instructions
  fix a typo in /docs/user-guide/configmap/index.md
  Fix monitor-node-health.md
  amend monitor-node-health.md
  Update manage-compute-resources-container.md
  ...

# Conflicts:
#	docs/tools/index.md
2017-03-21 19:04:37 -07:00
Andrew Chen 809473a677 Apply changes from PR #2784 (#2950) 2017-03-21 18:53:40 -07:00
Andrew Chen b3ac35430c Merge branch 'master' of https://github.com/kubernetes/kubernetes.github.io into release-1.6
* 'master' of https://github.com/kubernetes/kubernetes.github.io:
  Create hyperlink
  Add files via upload
  Fix typo
  Remove from TOC/Search: pods/init-containers ... (#2694)
  Add files via upload
  fix to taint the master node
  Move Guide topics: Container Lifestyle Hooks, Images, Volumes
  Correct ASM logo filename
  fixed ASM blurb
  Repair Spotinst logo
  Remove redundant section in deployments

# Conflicts:
#	docs/getting-started-guides/kubeadm.md
#	docs/user-guide/volumes.md
2017-03-21 15:54:35 -07:00
devin-donnelly a5899fc2ff Update components.md 2017-03-21 11:49:23 -07:00
Andrew Chen f0cd49a007 Move Guide topics: Container Lifestyle Hooks, Images, Volumes 2017-03-20 15:35:51 -07:00
sidharthamani 6e657471d3 add docs about cloud-controller-manager 2017-03-17 16:11:45 -07:00
Andrew Chen a0a51fb032 Move Guide topic: Parallel Processing using Expansions (#2867)
* Move Guide topic: Parallel Processing using Expansions

* fix links to /docs/user-guide/jobs/
2017-03-16 11:31:57 -07:00
Andrew Chen b65d0a30c9 Move Guide topic: Rolling Update Demo (#2850)
* Move Guide topic: Rolling Update Demo

* rename file
2017-03-15 17:31:38 -07:00
Steve Perry d01672cd2d Move What is Kubernetes topic. (#2851) 2017-03-15 17:21:06 -07:00
Steve Perry 3ab1fa20bc Move Kubernetes API page. (#2849) 2017-03-15 17:07:34 -07:00
Steve Perry 088cfc2c6f Concepts toc (#2840)
* Move Guide topic: Limit range.

* Adjust Concepts Overview TOC.
2017-03-15 16:49:02 -07:00
Steve Perry 7be7d6b519 Move a batch of cluster admin topics. (#2813) 2017-03-14 14:09:54 -07:00