Merge remote-tracking branch 'upstream/master' into toc-updates

2017-01-05 14:23:57 -08:00
parent 9c64c3ff7f 3b6141b4d3
commit 25798d3c86
17 changed files with 906 additions and 97 deletions
@@ -10,6 +10,8 @@ toc:
  - docs/tasks/configure-pod-container/assign-cpu-ram-container.md
  - docs/tasks/configure-pod-container/configure-volume-storage.md
  - docs/tasks/configure-pod-container/distribute-credentials-secure.md
+  - docs/tasks/configure-pod-container/pull-image-private-registry.md
+  - docs/tasks/configure-pod-container/configure-liveness-readiness-probes.md

 - title: Accessing Applications in a Cluster
  section: