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

Merge branch 'master' of https://github.com/kubernetes/kubernetes.github.io into release-1.7

Browse Source 
* 'master' of https://github.com/kubernetes/kubernetes.github.io:
  Update links to proper repos

# Conflicts:
#	docs/admin/kubeadm.md
#	docs/concepts/overview/kubernetes-api.md
#	docs/reference/api-overview.md
#	docs/setup/independent/create-cluster-kubeadm.md
#	docs/tasks/administer-cluster/configure-pod-disruption-budget.md
This commit is contained in:
Andrew Chen
2017-06-28 22:29:21 -07:00
parent 26e3c39204 2e192598a0
commit b40d09fe77
94 changed files with 255 additions and 205 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/concepts/workloads/controllers/garbage-collection.md
+2 -2
View File
@@ -165,9 +165,9 @@ kubectl delete replicaset my-repset --cascade=false
{% capture whatsnext %}
[Design Doc 1](https://github.com/kubernetes/community/blob/master/contributors/design-proposals/garbage-collection.md)
[Design Doc 1](https://git.k8s.io/community/contributors/design-proposals/garbage-collection.md)
[Design Doc 2](https://github.com/kubernetes/community/blob/master/contributors/design-proposals/synchronous-garbage-collection.md)
[Design Doc 2](https://git.k8s.io/community/contributors/design-proposals/synchronous-garbage-collection.md)
{% endcapture %}