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
..
Values.yaml	Move to Tasks: Core DNS Federation. (#3807)	2017-05-15 20:31:20 -07:00
federation-service-discovery.md	Update links to proper repos	2017-06-28 22:08:36 -07:00
policy-engine-deployment.yaml	Federation: Add task for setting up placement policies (#4075)	2017-06-26 11:13:43 -07:00
policy-engine-service.yaml	Federation: Add task for setting up placement policies (#4075)	2017-06-26 11:13:43 -07:00
policy.rego	Federation: Add task for setting up placement policies (#4075)	2017-06-26 11:13:43 -07:00
replicaset-example-policy.yaml	Federation: Add task for setting up placement policies (#4075)	2017-06-26 11:13:43 -07:00
scheduling-policy-admission.yaml	Federation: Add task for setting up placement policies (#4075)	2017-06-26 11:13:43 -07:00
set-up-cluster-federation-kubefed.md	Update links to proper repos	2017-06-28 22:08:36 -07:00
set-up-coredns-provider-federation.md	Address comments in PR #3997.	2017-06-21 16:39:29 -07:00
set-up-placement-policies-federation.md	Fix wording in placement policy task introduction	2017-06-27 09:42:19 -07:00