Commit Graph

2964 Commits (941195034941170aa01aa250f49efae88a74beb3)

Author SHA1 Message Date
devin-donnelly 9411950349 Merge branch 'master' into win_docker_clarif 2016-12-21 16:57:10 -05: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
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
Jie Luo 757f101117 fix some typos
Signed-off-by: Jie Luo <luo612@zju.edu.cn>
2016-12-21 16:37:06 +08: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
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
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
Ben Balter 5bab707a82 Merge branch 'master' into inline-titles 2016-12-19 18:46:34 -05:00
Janet Kuo 16d844bd5f Merge pull request #1989 from tianshapjq/patch-1
delete the question mark
2016-12-19 15:30:45 -08: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
Brendan Burns d6008cff5e Merge pull request #1734 from brendandburns/acr
Add directions for using Azure Container Registry.
2016-12-16 15:19:07 -08: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 ce4d6b1924 Merge pull request #1683 from colemickens/colemickens-pr-acs-launch
azure: update docs for Azure Container Service Kubernetes support
2016-12-16 13:39:34 -08:00
Brendan Burns b44002382b Merge branch 'master' into acr 2016-12-16 13:19:41 -08:00
Brendan Burns 13bdbc897f Merge branch 'master' into colemickens-pr-acs-launch 2016-12-16 13:18:05 -08:00
joshrosso e25374f3c8 statefulsets.md: Fix typos and make some statements more concise 2016-12-16 12:52:14 -08:00
Lucas Käldström cb8050007c Merge pull request #1968 from luxas/kubeadm_v15
Update the kubeadm documentation to v1.5
2016-12-16 17:29:12 +02:00
Lucas Käldström 09e40e26b3 Update the kubeadm documentation to v1.5 2016-12-16 16:29:28 +02:00
xialong.lee 4b74857310 make the docs content escaped from liquid template brace tag 2016-12-16 16:27:59 +08:00
Brendan Burns e174f4619d Add directions for using Azure Container Registry. 2016-12-15 20:36:34 -08:00
Cole Mickens 5961a799fe azure: update for k8s on acs launch 2016-12-15 20:30:10 -08:00
Brian Grant a3a3634fdb Merge pull request #1972 from duglin/patch-1
fix indentation of a few lines
2016-12-15 19:51:01 -08:00
Doug Davis 6b9326f085 fix indentation of a few lines 2016-12-15 18:30:55 -05:00
Ben Balter b301f4ad3a add notitle attribute to pages that shouldnt have a title 2016-12-15 17:06:04 -05:00