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

Merge branch 'master' of https://github.com/kubernetes/kubernetes.github.io into release-1.6

Browse Source 
* 'master' of https://github.com/kubernetes/kubernetes.github.io:
  getting-started-guides: add CoreOS Tectonic
  add DefaultTolerationSeconds admission controller
  Move Guide topic: Connect with Proxies. (#2663)
  Move Guide topic: Bootstrapping Pet Sets. (#2662)
  Move Guide topic: Using Port Forwarding. (#2661)
  fix typo (#2656)
  Move Guide topic: Using Environment Variables. (#2645)
  missing word
  Prototype for deprecating User Guide topic.
  Update static-pods.md
  Update static-pods.md
This commit is contained in:
Andrew Chen
2017-03-02 09:49:33 -08:00
parent 46c212b7a8 c3e5ad74c5
commit 06b5791afa
15 changed files with 71 additions and 203 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_data/concepts.yml
+1
View File
@@ -20,6 +20,7 @@ toc:
- title: Controllers
section:
- docs/concepts/abstractions/controllers/statefulsets.md
- docs/concepts/abstractions/controllers/petsets.md
- docs/concepts/abstractions/controllers/garbage-collection.md
- title: Object Metadata
_data/guides.yml
-1
View File
@@ -56,7 +56,6 @@ toc:
- title: Containers and Pods
section:
- docs/user-guide/simple-nginx.md
- docs/user-guide/pods/single-container.md
- docs/user-guide/pods/multi-container.md
- docs/user-guide/pods/init-container.md