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

resolving conflicts

Browse Source
This commit is contained in:
Savitha Raghunathan
2020-07-19 19:15:36 -04:00
parent a25db870c3 c477e089b7
commit 53f2d23359
255 changed files with 7212 additions and 4368 deletions
Download Patch File Download Diff File Expand all files Collapse all files
static/_redirects
+2 -3
View File
@@ -130,7 +130,7 @@
/docs/concepts/workloads/controllers/cron-jobs/deployment/ /docs/concepts/workloads/controllers/cron-jobs/ 301
/docs/concepts/workloads/controllers/daemonset/docs/concepts/workloads/pods/pod/ /docs/concepts/workloads/pods/pod/ 301
/docs/concepts/workloads/controllers/deployment/docs/concepts/workloads/pods/pod/ /docs/concepts/workloads/pods/pod/ 301
/docs/concepts/workloads/controllers/job/ /docs/concepts/workloads/controllers/job/ 301
/docs/concepts/workloads/controllers/jobs-run-to-completion/ /docs/concepts/workloads/controllers/job/ 301
/docs/concepts/workloads/controllers/statefulsets/ /docs/concepts/workloads/controllers/statefulset/ 301
/docs/concepts/workloads/controllers/statefulset.md /docs/concepts/workloads/controllers/statefulset/ 301!
@@ -303,7 +303,6 @@
/docs/tutorials/kubernetes-basics/update-intro/ /docs/tutorials/kubernetes-basics/update/update-intro/ 301
/ja/docs/tutorials/kubernetes-basics/update-intro/ /ja/docs/tutorials/kubernetes-basics/update/update-intro/ 301
/ko/docs/tutorials/kubernetes-basics/update-intro/ /ko/docs/tutorials/kubernetes-basics/update/update-intro/ 301
/docs/tutorials/example-tutorial-template.md -> /example-templates/example-tutorial-template.md 301
/docs/tutorials/object-management-kubectl/declarative-object-management-configuration/ /docs/concepts/overview/object-management-kubectl/declarative-config/ 301
/docs/tutorials/object-management-kubectl/imperative-object-management-command/ /docs/concepts/overview/object-management-kubectl/imperative-command/ 301
/docs/tutorials/object-management-kubectl/imperative-object-management-configuration/ /docs/concepts/overview/object-management-kubectl/imperative-config/ 301
@@ -497,4 +496,4 @@
/docs/setup/multiple-zones/ /docs/setup/best-practices/multiple-zones/ 301
/docs/setup/cluster-large/ /docs/setup/best-practices/cluster-large/ 301
/docs/setup/node-conformance/ /docs/setup/best-practices/node-conformance/ 301
/docs/setup/certificates/ /docs/setup/best-practices/certificates/ 301
/docs/setup/certificates/ /docs/setup/best-practices/certificates/ 301