Devin Donnelly
92c10a487d
Merge remote-tracking branch 'upstream/master' into concepts-root
2017-01-18 12:32:04 -08:00
Phillip Wittrock
5b37a301cd
Merge pull request #2277 from gregoplex/master
...
Fixed doc typo
2017-01-18 08:52:54 -08:00
Phillip Wittrock
3fe111a73f
Merge pull request #2283 from BenHall/katacoda-style-change
...
Remove some padding around Katacoda to give it a little more space.
2017-01-18 08:51:14 -08:00
khalpin11
0168fbc029
Fix docs typo
...
"Action use IaaS providers reliable storage (e.g. GCE PD or AWS EBS volume) for VMs with apiserver+etcd" did not follow the same format as other actions in this section.
2017-01-18 09:32:37 -07:00
ahawtho
56bac5a749
Fix link on environment-guide
...
The 'pod definition' link in the 'Query the service' section had an incorrect link.
2017-01-18 09:48:56 -05:00
Peter Lee
fe1640a71e
fix yaml source links of addons
2017-01-18 16:48:45 +08:00
Peter Lee
f86d09dab3
fix broken link
2017-01-18 12:57:01 +08:00
Marc Boorshtein
91ddb6aa08
Merge branch 'master' into master
2017-01-17 21:09:41 -05:00
gregoplex
4fb669be11
Fixed doc typo
2017-01-17 20:35:24 -05:00
Steve Perry
96a07031ea
Merge pull request #2206 from steveperry-53/hello-mini
...
Fix code and fix link to code.
2017-01-17 17:01:18 -08:00
Janet Kuo
7dd6fe48c4
Bump links in navigation from 1.3 to 1.5
2017-01-17 17:00:43 -08:00
Janet Kuo
4ef058c970
Use {{page.version}} instead of hard-coded release number
2017-01-17 17:00:43 -08:00
Steve Perry
cbd6490208
Merge branch 'master' into hello-mini
2017-01-17 16:59:31 -08:00
Steve Perry
edeb4f3c39
Merge pull request #2142 from Crassirostris/stackdriver-docs-refactoring-2
...
Stackdriver docs refactoring
2017-01-17 16:38:53 -08:00
Steve Perry
bd252eb0ca
Merge branch 'master' into stackdriver-docs-refactoring-2
2017-01-17 16:36:46 -08:00
xilabao
a2d0e7c165
update role example
2017-01-17 16:35:01 -08:00
Steve Perry
4b722c9c2a
Merge branch 'master' into stackdriver-docs-refactoring-2
2017-01-17 16:34:13 -08:00
caiyixiang
4bd2d4ce8e
Update ingress.md
2017-01-18 08:33:28 +08:00
caiyixiang
1e40f9fea5
Update index.md
2017-01-17 16:29:13 -08:00
Steve Perry
0bc2efe4d2
Merge pull request #2204 from steveperry-53/env-yaml
...
Fix link.
2017-01-17 16:22:29 -08:00
Steve Perry
b6465d0747
Merge branch 'master' into env-yaml
2017-01-17 16:20:07 -08:00
Jared
e8a49bb4f0
Merge pull request #1370 from gavinB-orange/patch-1
...
Update minikube.md to cover use behind a web proxy
2017-01-17 16:18:26 -08:00
Steve Perry
7a773baa52
Merge branch 'master' into env-yaml
2017-01-17 16:17:57 -08:00
Jared
da1ad29c8e
Merge branch 'master' into patch-1
2017-01-17 16:14:05 -08:00
Jared
7ca44701da
Update minikube.md
2017-01-17 16:13:36 -08:00
Steve Perry
3cd4afbe79
Merge pull request #2226 from steveperry-53/redirect-production-pods
...
Redirect User Guide topic: Working with Containers in Production.
2017-01-17 16:13:25 -08:00
Steve Perry
775b9d0681
Merge branch 'master' into redirect-production-pods
2017-01-17 16:11:37 -08:00
devin-donnelly
2a6291857f
Merge pull request #2275 from janetkuo/fix-travis
...
Fix travis failure by bumping go version to 1.7.3
2017-01-17 16:09:34 -08:00
devin-donnelly
59b6d0d63a
Merge branch 'master' into fix-travis
2017-01-17 16:07:29 -08:00
Jared
ac70ebfe06
Merge branch 'master' into patch-1
2017-01-17 16:07:20 -08:00
Michael Mrowetz
705f74fad0
de-duplicated sentence.
2017-01-17 16:05:50 -08:00
Janet Kuo
4a33f4f44c
Fix travis failure by bumping go version to 1.7.3
2017-01-17 16:03:13 -08:00
Francesc Rosas
2495fb890d
Fix jsonpath
2017-01-17 16:02:43 -08:00
Phillip Wittrock
ab705577e2
Merge pull request #2225 from steveperry-53/container-hooks
...
Write new Task: Attaching Handlers to Container Lifecycle Events.
2017-01-17 13:53:02 -08:00
Nathan Quarles
8858b56753
grammar fix
2017-01-17 13:06:33 -08:00
steveperry-53
6a6028c727
Address reviewer comments.
2017-01-17 12:40:55 -08:00
steveperry-53
26385f0e46
Write new Task: Attaching Handlers to Container Lifecycle Events.
2017-01-17 12:06:55 -08:00
Jared
0286b535be
Merge pull request #2242 from xialonglee/patch-1
...
fix the named anchor
2017-01-17 11:23:53 -08:00
Steve Perry
416ab397a7
Merge branch 'master' into redirect-production-pods
2017-01-17 11:19:14 -08:00
Jared
53afb3450e
Merge pull request #2246 from xingzhou/typo
...
Fixed Typo
2017-01-17 11:17:21 -08:00
Steve Perry
4e4dcbf50b
Merge branch 'master' into env-yaml
2017-01-17 11:16:04 -08:00
Jared
bc02d6b56b
Merge branch 'master' into reorganization
2017-01-17 11:13:10 -08:00
Jared
f83bd527d4
Renamed "Petset" to Statefulset
...
Renamed feature, fixed link
https://github.com/kubernetes/kubernetes.github.io/issues/2240
2017-01-17 10:52:12 -08:00
Marc Boorshtein
b192b3ee00
Merge branch 'master' into master
2017-01-17 13:45:26 -05:00
Jared
284f5c4735
Remove broken link
...
Remove broken link to "persistent volume provisioning"
2017-01-17 10:37:52 -08:00
Marc Boorshtein
5244bb8b6e
integrated docs from ts.com wiki w/o product info
2017-01-16 08:12:43 -05:00
Xing Zhou
ab7cbe3a49
Fixed Typo
2017-01-16 11:03:16 +08:00
tanshanshan
1095dd27ab
Merge branch 'master' into replace-scheduler-command
2017-01-16 08:59:57 +08:00
Peter Lee
4f3c295182
fix the named anchor
...
name anchor `loading-and-merging` should be `loading-and-merging-rules`
2017-01-15 23:09:45 +08:00
caiyixiang
b9c0d80bbc
Update ingress.md
2017-01-14 15:07:09 +08:00