Commit Graph

4243 Commits

Author SHA1 Message Date
mbohlool 517e3c30f9 Mention OpenAPI in API docs 2016-12-21 14:12:57 -08:00
devin-donnelly 101414df5e Merge branch 'master' into fix-cm-link 2016-12-21 17:04:26 -05:00
devin-donnelly 8afbb0adb5 Merge pull request #2010 from luojie233/branch2
Duplicated 'the'
2016-12-21 17:04:06 -05:00
devin-donnelly b5c544ee7c Merge pull request #2016 from apprenda/win_docker_clarif
Docker version requirements and adding New VMSwitch
2016-12-21 17:02:53 -05:00
Steve Gordon c3b282f2b6 Provide valid --cloud-providers
Provide valid --cloud-providers, vagrant and openshift were listed but is not actually a valid cloud provider in this context in the current code base while a number of other valid options were omitted including azure, cloudstack, openstack, photon and vsphere.
2016-12-21 17:02:52 -05:00
devin-donnelly 505e8604cc Merge pull request #2006 from steveperry-53/expose
Create prerequisites appropriate for load balancer.
2016-12-21 17:00:44 -05:00
devin-donnelly 221038bfa9 Merge pull request #2002 from bibryam/various-typos
Small typos fixed
2016-12-21 17:00:10 -05:00
devin-donnelly efb23810aa Merge branch 'master' into fix-cm-link 2016-12-21 16:58:46 -05:00
devin-donnelly 9411950349 Merge branch 'master' into win_docker_clarif 2016-12-21 16:57:10 -05:00
devin-donnelly 619c3ea3b1 Merge branch 'master' into branch2 2016-12-21 16:55:29 -05:00
king-julien 5e1bd59697 Merge branch 'master' into master 2016-12-21 15:19:13 -06:00
Jared 8b675f508a Merge branch 'master' into branch3 2016-12-21 12:58:10 -08:00
Anthony Yeh 9f9e44d174 Remove accidentally nested {% raw %} tags.
These tags cannot be nested, causing a Liquid syntax error.
The nesting was introduced accidentally by concurrent PRs.
2016-12-21 11:43:09 -08:00
Matt Baldwin d67b36760d Merge branch 'master' into master 2016-12-21 11:20:44 -08:00
Jitendra Bhurat 0573336261 Making the Docker version requirement clear and added command to create a new VMSwtich for kube-proxy to use 2016-12-21 13:32:35 -05:00
king-julien 18c3073e35 Merge branch 'master' into master 2016-12-21 10:02:00 -06:00
Jie Luo 757f101117 fix some typos
Signed-off-by: Jie Luo <luo612@zju.edu.cn>
2016-12-21 16:37:06 +08:00
Jie Luo ccd202a07a Duplicated 'the'
Signed-off-by: Jie Luo <luo612@zju.edu.cn>
2016-12-21 14:33:37 +08:00
Bilgin Ibryam b4e6c6e1c7 Fixed cricial to critical 2016-12-21 06:24:43 +00:00
xiangpengzhao 42d9427b75 Fix #2005: Issue with /docs/user-guide/horizontal-pod-autoscaling/ 2016-12-20 23:05:45 -05:00
devin-donnelly a196d0df86 Merge pull request #1956 from andrewwatson/patch-3
Header displayed twice
2016-12-20 19:40:32 -05:00
devin-donnelly a23924073c Merge pull request #1974 from xialonglee/escape-from-liquid-template
Make the docs content escaped from liquid template brace tag
2016-12-20 19:39:47 -05:00
devin-donnelly 4aa38e338a Merge pull request #1983 from joshrosso/services-cleanup-2
services: Clearer definition of types; typo fixes
2016-12-20 19:38:53 -05:00
devin-donnelly 7d1b3536e4 Merge pull request #1980 from joshrosso/statefulsets-typo-concise
statefulsets.md: Fix typos and make some statements more concise
2016-12-20 19:28:12 -05:00
devin-donnelly 0b3834ce57 Merge pull request #1997 from philips/remove-conformance-field
getting-started-guides: remove conformance column
2016-12-20 19:27:14 -05:00
devin-donnelly eef418c5f6 Merge pull request #1999 from cychiang/patch-1
Inconsistent command in section (5/5)
2016-12-20 19:26:30 -05:00
devin-donnelly d3f9bdfe24 Merge pull request #2001 from chentao1596/kubelet-static-pod-config
static-pod: --config should be changed to -pod-manifest-path
2016-12-20 19:25:50 -05:00
devin-donnelly 40e658f12d Merge pull request #2000 from xialonglee/cancel-italic-title
Delete italic style markdown symbol
2016-12-20 19:25:22 -05:00
devin-donnelly e29a288c98 Merge pull request #2003 from xilabao/add-reference-to-rbac-psp
add reference to rbac  psp
2016-12-20 19:18:07 -05:00
king-julien a213c71877 Merge branch 'master' into master 2016-12-20 16:33:11 -06:00
steveperry-53 e380ff891d Create prerequisites appropriate for load balancer. 2016-12-20 14:11:35 -08:00
devin-donnelly 71f32c8618 Merge pull request #2004 from nlamirault/patch-1
Fix kube-dns component name
2016-12-20 16:07:17 -05:00
devin-donnelly fc7d0698e4 Merge branch 'master' into calico-addon-link 2016-12-20 15:59:58 -05:00
Nicolas Lamirault fd5e585ebf Fix kube-dns component name 2016-12-20 11:29:44 +01:00
xilabao 194bf76648 add reference to rbac & psp 2016-12-20 16:52:21 +08:00
Bilgin Ibryam b413c7eecb Small typos fixed 2016-12-20 08:47:16 +00:00
chentao 4f59dd333f change to new config 2016-12-20 16:41:51 +08:00
Gunjan Patel 09bb00cea2 Merge branch 'master' into calico-addon-link 2016-12-19 23:53:29 -08:00
xialong.lee 231b924608 delete italic style 2016-12-20 09:55:11 +08:00
Casper CY Chiang 4153f2f8ad Inconsistent commands in section (5/5)
The original one is: "kops update cluster useast1.dev.awsdata.com --yes"
However, the previous example used useast1.dev.example.com to create configuration file.
So, the "awsdata" should be changed into example.
2016-12-20 09:33:57 +08:00
Brandon Philips f562d64d1f getting-started-guides: remove conformance column
This column is sort of pointless as the only data points are two year
old gists.
2016-12-19 16:15:04 -08:00
Bilgin Ibryam 7d57100498 Merge branch 'master' into wrong-url 2016-12-20 00:14:18 +00:00
Ben Balter 5bab707a82 Merge branch 'master' into inline-titles 2016-12-19 18:46:34 -05:00
king-julien 9cefac3618 More Description: use the minikube's built-in Docker daemon 2016-12-19 14:28:33 -06:00
Ben Balter d8d99a171e use in-page titles to generate sidebar nav 2016-12-19 15:08:54 -05:00
Drinky Pool 030e6f230c delete the question mark
1. add "been" right before restarted.
2. delete the question mark at the end of the sentence.
2016-12-19 16:57:08 +08:00
Peter Lee 6f2b08ced7 Merge branch 'master' into escape-from-liquid-template 2016-12-17 08:44:07 -06:00
joshrosso cbd92ba562 services: Clearer definition of types; typo fixes
This commit attempts to make more clear the differences between service
types by ensuring definitions are consistent and concise. It also aims
to fix a few typos and grammatical issues.
2016-12-16 14:39:12 -08:00
Brendan Burns 22eb15218a Merge branch 'master' into acr 2016-12-16 13:40:18 -08:00
Brendan Burns b44002382b Merge branch 'master' into acr 2016-12-16 13:19:41 -08:00