Review conflicts from 1.6-release/master merges

This commit is contained in:
Andrew Chen
2017-04-20 10:46:59 -07:00
parent 800f1b588d
commit cb9cff59db
5 changed files with 3 additions and 69 deletions
+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/workloads/controllers/jobs-run-to-completion/)