Merge pull request #2926 from devin-donnelly/release-1.6

Merge latest from Master into Release 1.6
This commit is contained in:
devin-donnelly
2017-03-20 13:57:54 -07:00
committed by GitHub
2 changed files with 2 additions and 2 deletions
+1 -1
View File
@@ -8,4 +8,4 @@ title: Kubernetes API Overview
{% include user-guide-content-moved.md %}
[The Kubernetes API](/docs/concepts/overview/kubernetes-api/)
[The Kubernetes API](/docs/concepts/overview/kubernetes-api/)
+1 -1
View File
@@ -4,4 +4,4 @@ title: Jobs
{% include user-guide-content-moved.md %}
[Run to Completion Finite Workloads](/docs/concepts/jobs/run-to-completion-finite-workloads/)
[Run to Completion Finite Workloads](/docs/concepts/jobs/run-to-completion-finite-workloads/)