Commit Graph

4597 Commits (ce3fc44034d8c47bcd2057c88bf2975da3c573a8)

Author SHA1 Message Date
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
Andrew Chen c29b4868e6 Merge pull request #1804 from vonneudeck/patch-1
Added info about where to add/drop capabilities
2017-01-13 17:43:21 -08:00
Andrew Chen 06d21c950f Merge branch 'master' into patch-1 2017-01-13 17:40:03 -08:00
Andrew Chen 4143b1c1c1 Merge pull request #2207 from kubernetes/chenopis-patch-4
Fix outdated links re: issue #1843
2017-01-13 17:35:26 -08:00
Andrew Chen 8f6c10c9e9 Merge branch 'master' into chenopis-patch-4 2017-01-13 17:30:46 -08:00
Andrew Chen 0b95c6d14d Merge pull request #2192 from kubernetes/chenopis-patch-3
fix broken link
2017-01-13 17:30:10 -08:00
Andrew Chen 2041d8a7f4 Merge branch 'master' into chenopis-patch-3 2017-01-13 16:20:07 -08:00
Steve Perry dc41ea8022 Merge branch 'master' into hello-mini 2017-01-13 15:21:36 -08:00
Phillip Wittrock 53b571f6b7 Merge pull request #2237 from pwittrock/update-ref
Update reference docs to fix issues with query vs path params
2017-01-13 15:19:26 -08:00
Phillip Wittrock 72928098ef Fix issue in reference docs where query parameters were listed as path params and body params were listed as query params. 2017-01-13 15:08:36 -08:00
Phillip Wittrock 2456376b44 add intellij project file to .gitignore 2017-01-13 15:07:24 -08:00
Jeff Mendoza 811302f2fa Merge pull request #2235 from jeffmendoza/fix-travis
Fix more imports in tests.
2017-01-13 14:05:07 -08:00
Jeff Mendoza de9b06b3bf Fix more imports in tests. 2017-01-13 14:00:36 -08:00
Jeff Mendoza c9be46cb9a Merge pull request #2234 from jeffmendoza/fix-travis
Fix travis
2017-01-13 13:55:19 -08:00