Commit Graph

2144 Commits (e21ed27c58219b9db5be0f8f4a596f5f53e02965)

Author SHA1 Message Date
steveperry-53 d35628f4cf Merge branch 'steveperry-53-bcamp' 2016-09-26 16:11:51 -07:00
steveperry-53 01ca71e344 Merge branch 'bcamp' of https://github.com/steveperry-53/steveperry-53.github.io into steveperry-53-bcamp 2016-09-26 16:11:12 -07:00
devin-donnelly 1660d47d14 Merge pull request #1148 from davidopp/master
Update user-guide/node-selection/index.md to include pod affinity/anti-affinity
2016-09-26 15:51:06 -07:00
David Oppenheimer 034f9a808d Update user-guide/node-selection/index.md to include pod affinity/anti-affinity
and addd an example. Also clean up user-guide/node-selection/index.md a bit.
2016-09-26 15:46:51 -07:00
Steve Perry 3dc9f20d49 Merge pull request #1309 from steveperry-53/templates3
Write page templates and canonical examples.
2016-09-26 15:12:21 -07:00
Steve Perry aaef454bea Merge branch 'master' into templates3 2016-09-26 15:06:33 -07:00
scotty 56b9fa43f6 css refinements 2016-09-26 14:40:56 -07:00
scotty 47591953dc css refinements 2016-09-26 14:38:02 -07:00
scotty 16d8224a51 Merge remote-tracking branch 'origin/master' 2016-09-26 14:24:48 -07:00
scotty ffc513d5b1 home page updates for case studies 2016-09-26 14:24:41 -07:00
devin-donnelly a581b8087e Merge pull request #1011 from aidevops/master
updated access to cluster/api w/o proxy post kube v1.3.2
2016-09-26 13:30:02 -07:00
devin-donnelly ff54de9ae0 Merge pull request #1125 from erictune/rbacgroupref
How to refer to rervice account groups in RBAC
2016-09-26 13:25:14 -07:00
devin-donnelly d0e15b0f38 Merge pull request #1247 from samos123/update-demo-fixes
Fix update documentation reference to doc location
2016-09-26 13:23:58 -07:00
devin-donnelly 6bad1e3ce2 Merge pull request #1282 from YuPengZTE/dev
The etc and dot is seprated
2016-09-26 13:17:53 -07:00
devin-donnelly e53615460d Merge pull request #1283 from YuPengZTE/devFirst
Capitalizes the first letter
2016-09-26 13:16:46 -07:00
devin-donnelly 53f0dbbe8a Merge pull request #1259 from chmouel/patch-1
minor spelling update
2016-09-26 13:16:05 -07:00
devin-donnelly 942dda1b66 Merge pull request #1293 from a-robinson/typo
Don't reference elasticsearch/kibana in gce getting started guide
2016-09-26 13:13:51 -07:00
scotty 063c84ff29 home page updates for case studies 2016-09-26 12:55:13 -07:00
scotty 1b327e1740 sap logo 2016-09-26 12:10:56 -07:00
scotty d56985239b Merge remote-tracking branch 'origin/master' 2016-09-26 12:08:00 -07:00
scotty a050ee1a78 video thumb 2016-09-26 12:07:51 -07:00
devin-donnelly e51b0a40bc Merge pull request #1310 from devin-donnelly/master
Adds missing titles to all Federation docs for 1.4, plus a link to Federated ingress from the Federation index page.
2016-09-26 11:52:14 -07:00
Devin Donnelly 63bb0d449d Typo fix. 2016-09-26 11:45:00 -07:00
Devin Donnelly bfe0194e9e Bug fix in TOC. 2016-09-26 11:43:54 -07:00
scotty 7b17874287 case studies 2016-09-26 11:39:54 -07:00
Devin Donnelly fae6e5b331 Added Federation docs to TOC (in reference for now; this is not where they should permanently go).
This should fix the issue where TOCs and Titles do not appear for Federation docs.
2016-09-26 11:37:58 -07:00
scotty 06dc818dc4 Merge remote-tracking branch 'origin/master' 2016-09-26 11:32:35 -07:00
scotty 13a9dd5cdc case studies 2016-09-26 11:32:26 -07:00
Devin Donnelly 8ea18355d1 Added title. 2016-09-26 11:27:32 -07:00
Devin Donnelly 16a304f77a Added title. 2016-09-26 11:18:13 -07:00
Devin Donnelly d30443d659 Added title. 2016-09-26 11:18:00 -07:00
Devin Donnelly 349f3bc8a5 Added title. 2016-09-26 11:17:45 -07:00
Devin Donnelly 7e53161eec Added a link to Federated Ingress to the list of guides. 2016-09-26 11:17:19 -07:00
Devin Donnelly 83842f10ec Added title. 2016-09-26 11:16:59 -07:00
devin-donnelly 971f6a44e7 Merge pull request #549 from mwhooker/patch-1
mark node phase as deprecated
2016-09-26 10:35:35 -07:00
devin-donnelly 98eaa04dc6 Merge pull request #1070 from justinsb/network_plugin_mtu
Document `network-plugin-mtu` option
2016-09-26 10:35:16 -07:00
devin-donnelly 37e296de63 Merge pull request #1267 from quinton-hoole/2016-09-19-federated-ingress-user-guide
Federated Ingress User Guide
2016-09-26 10:34:25 -07:00
devin-donnelly ba97178584 Merge pull request #1235 from keglevich3/patch-3
This feature wasn't ready in 1.3V
2016-09-26 10:34:06 -07:00
devin-donnelly 1cc3c16994 Merge pull request #1307 from kubernetes/release-1.4
Publish documentation changes related to Kubernetes 1.4 release
2016-09-26 10:33:45 -07:00
devin-donnelly 778c119835 Merge pull request #1265 from lukemarsden/master
[WIP] kubeadm and add-on docs
2016-09-26 10:31:43 -07:00
Eric Tune 3750c217ec How to refer to rervice account groups in RBAC 2016-09-26 10:21:27 -07:00
steveperry-53 822d59b5e4 Write page templates and canonical examples.
Conflicts:
	_data/tasks.yml
	_data/tutorials.yml
	docs/tasks/access-kubernetes-api/http-proxy-access-api.md
	docs/tasks/index.md
	docs/tutorials/index.md
2016-09-26 08:06:06 -07:00
Luke Marsden e6eac66c94 Include slightly surprising output. 2016-09-26 15:18:33 +01:00
Luke Marsden e6f488c555 Required for now for this to work 2016-09-26 15:09:25 +01:00
Luke Marsden 807827c645 Clarify. 2016-09-26 14:35:41 +01:00
Luke Marsden fe30e27200 Fix alignment 2016-09-26 14:27:06 +01:00
Luke Marsden 8c43a0b759 Make the uninstall script look like code 2016-09-26 14:25:07 +01:00
Luke Marsden 7d434d58b9 Clarify that this reverts what kubeadm did rather than uninstalling the packages. 2016-09-26 14:20:47 +01:00
Luke Marsden 3cf4c842f9 Move CNAME file back. 2016-09-26 14:12:46 +01:00
Luke Marsden 10884384de kubeadm and add-ons docs 2016-09-26 14:12:02 +01:00