Commit Graph

5 Commits (ac5c52f860c42414a7383d3e95b485bae9421eb2)

Author SHA1 Message Date
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
Christoph Blecker 2e192598a0 Update links to proper repos 2017-06-28 22:08:36 -07:00
Tim Hockin 472eccc83c Use correct apigroup for network policy 2017-06-28 17:25:22 -07:00
Andrew Chen f4dcee7526 Merge branch 'master' of https://github.com/kubernetes/kubernetes.github.io into release-1.7
* 'master' of https://github.com/kubernetes/kubernetes.github.io:
  networkpolicies.md --> network-policies.md for SEO
  Added link (#4161)
  Use "sudo -i" instead of "sudo su -"
  Create a section for kubeadm topics
  Consolidate SecurityContext topics. (#4005)
  Typo fix in "Adding ConfigMap data to a Volume" section (#3966)
2017-06-22 10:57:56 -07:00
Ahmet Alp Balkan e883a27f3b networkpolicies.md --> network-policies.md for SEO
Signed-off-by: Ahmet Alp Balkan <ahmetb@google.com>
2017-06-22 10:47:34 -07:00