Andrew Chen b40d09fe77 Merge branch 'master' of https://github.com/kubernetes/kubernetes.github.io into release-1.7 ... * '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		2017-06-28 22:29:21 -07:00
..
cluster.md	Federated ClusterSelector	2017-06-28 13:29:07 -07:00
configmap.md	Deprecation complete: node-problem ... (#3550)	2017-04-26 13:53:19 -07:00
daemonset.md	Deprecation complete: node-problem ... (#3550)	2017-04-26 13:53:19 -07:00
deployment.md	Deprecation complete: federation/daemonsets ... (#3551)	2017-04-26 14:13:54 -07:00
events.md	Deprecation complete: federation/daemonsets ... (#3551)	2017-04-26 14:13:54 -07:00
ingress.md	Update links to proper repos	2017-06-28 22:08:36 -07:00
namespaces.md	Deprecation complete: federation/daemonsets ... (#3551)	2017-04-26 14:13:54 -07:00
replicaset.md	Deprecation complete: federation/daemonsets ... (#3551)	2017-04-26 14:13:54 -07:00
secret.md	Deprecation complete: federation/daemonsets ... (#3551)	2017-04-26 14:13:54 -07:00