Commit Graph

3215 Commits (e2b16a577c3f8223f7bd5cd12142fbb8058b5143)

Author SHA1 Message Date
devin-donnelly a6e432afa3 Merge pull request #1951 from Nanopy/UC-design-patch
UC design patch
2016-12-21 14:56:52 -08:00
devin-donnelly 4f5b3fb8f0 Merge branch 'master' into UC-design-patch 2016-12-21 17:32:25 -05:00
devin-donnelly 8170aaa50e Merge pull request #1961 from InQuicker/kubelet-auth-formatting
Fix the formatting of bullet lists on the kubelet auth page.
2016-12-21 17:25:42 -05:00
devin-donnelly 2fc412b5fb Merge pull request #1978 from shettyg/docs
networking.md: Add OVN as a networking plugin option.
2016-12-21 17:23:18 -05:00
devin-donnelly a7f9e915d9 Merge pull request #2008 from xiangpengzhao/fix-cm-link
Fix broken link in the horizontal pod autoscaling doc
2016-12-21 17:18:10 -05:00
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 0dc72d1f7a Merge pull request #2011 from luojie233/branch3
fix some typos
2016-12-21 13:00:10 -08:00
Jared 8b675f508a Merge branch 'master' into branch3 2016-12-21 12:58:10 -08:00
devin-donnelly 2f83bece90 Merge pull request #2017 from enisoc/fix-liquid-raw
Remove accidentally nested {% raw %} tags.
2016-12-21 15:12:18 -05: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 7234d6d144 Merge pull request #1971 from gunjan5/calico-addon-link
Update Calico docs link
2016-12-20 16:06:50 -05:00
devin-donnelly fc7d0698e4 Merge branch 'master' into calico-addon-link 2016-12-20 15:59:58 -05:00
Jess Frazelle de273e1df9 Merge pull request #1994 from benbalter/inline-titles
Use in-page titles to generate sidebar nav
2016-12-20 11:30:24 -08:00
Ben Balter a7c1cc431c semantically version jekyll-include-cache 2016-12-20 14:21:48 -05:00
Ben Balter ae7983fe62 bump to pages gem v112 2016-12-20 14:19:08 -05:00
Ben Balter 22f31bd4ee tell netify to disable the plugin whitelist for now 2016-12-20 10:05:57 -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