Merge remote-tracking branch 'upstream/master' into release-1.6

This commit is contained in:
Devin Donnelly
2017-02-28 14:33:19 -08:00
15 changed files with 497 additions and 547 deletions
+1
View File
@@ -35,6 +35,7 @@ toc:
- title: Configuration
section:
- docs/concepts/configuration/container-command-args.md
- docs/concepts/configuration/manage-compute-resources-container.md
- title: Policies
section:
+1 -1
View File
@@ -3,7 +3,7 @@ abstract: "Step-by-step instructions for performing operations with Kubernetes."
toc:
- docs/tasks/index.md
- title: Using the Kubectl Command-Line
- title: Using the kubectl Command-Line
section:
- docs/tasks/kubectl/list-all-running-container-images.md
- docs/tasks/kubectl/get-shell-running-container.md