Commit Graph

4372 Commits

Author SHA1 Message Date
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
unisisdev 61a60eec84 Described how deploy the Dashboard UI 2016-12-16 15:16:36 -03:00
Joe Beda c413ee7c04 Merge branch 'master' into patch-1 2016-12-16 09:02:00 -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
Gurucharan Shetty 27d614a4f5 networking.md: Add OVN as a networking plugin option.
OVN is an opensource network virtualization solution
developed by the Open vSwitch community.  It lets one
create logical switches, logical routers, stateful
ACLs, load-balancers etc to build different virtual
networking topologies.  The project has a specific
Kubernetes plugin and documentation at
https://github.com/openvswitch/ovn-kubernetes.
2016-12-15 23:32:24 -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
Gunjan Patel 56fac4ee23 Merge branch 'master' into calico-addon-link 2016-12-15 13:46:27 -08:00
Jared ab8f4e58c6 Merge pull request #1970 from janetkuo/defalut-version-1.5
Bump default {{page.version}} to v1.5.1
2016-12-15 13:45:55 -08:00
Jared 74317d519d Merge branch 'master' into defalut-version-1.5 2016-12-15 13:40:02 -08:00
Jared 8c0d267536 Merge pull request #1965 from dbaumgarten/patch-1
Wrong path for cloud-config in kubeadm.md
2016-12-15 13:37:37 -08:00
gunjan5 668e1a27dd Update Calico docs link 2016-12-15 13:25:49 -08:00
Janet Kuo 9b432f24e6 Remove .0 suffix from all references to {{page.version}} 2016-12-15 13:14:47 -08:00
Janet Kuo 664459c407 Bump default {{page.version}} to v1.5.1 2016-12-15 13:05:54 -08:00
Ben Balter bfa604351f add explicit titles to docs 2016-12-15 15:16:54 -05:00
Jared 8a70253a30 Merge branch 'master' into patch-1 2016-12-15 12:06:16 -08:00
Jared d2f8efcd49 Merge pull request #1966 from joerocklin/patch-1
Fix link to nuage
2016-12-15 12:05:51 -08:00
Jared edbf9471ac Merge branch 'master' into patch-1 2016-12-15 12:03:50 -08:00
Jared b7a9a4bd4f Merge branch 'master' into patch-1 2016-12-15 12:03:35 -08:00
Jared 7d3a56cbca Merge pull request #1950 from madhusudancs/kubefed-fixes
Fix URL typo and whitespace.
2016-12-15 11:58:55 -08:00
Martin Rauscher e8515af9e8 Merge branch 'master' into patch-1 2016-12-15 20:58:18 +01:00
Jared c3ec5e82cc Merge branch 'master' into kubefed-fixes 2016-12-15 11:53:51 -08:00
Janet Kuo 1e87edd33a Merge pull request #1653 from kargakis/proportional-scaling
Proportional scaling in Deployments
2016-12-15 10:52:51 -08:00
Janet Kuo 0fee7eb542 Merge branch 'master' into proportional-scaling 2016-12-15 10:46:44 -08:00
Jeff Mendoza b0731c723c Merge pull request #1957 from alejandroEsc/ae/minikube_links
Updates to minikube.md (broken links)
2016-12-15 10:39:10 -08:00
Joe Beda 4581aa844b Merge branch 'master' into patch-1 2016-12-15 10:21:53 -08:00
Michail Kargakis 7a145852b9 Proportional scaling in Deployments 2016-12-15 18:14:50 +01:00
Joe Rocklin 01bfb7925f Fix link to nuage
previous markdown resulted in a relative reference, which lead to a 404.
2016-12-15 11:47:10 -05:00
dbaumgarten 061a332ac4 Wrong path for cloud-config in kubeadm.md
The cloud-config file should be located under `/etc/kubernetes/cloud-config` instead of /etc/kubernetes/cloud-config.json.
(See: https://github.com/kubernetes/kubernetes/blob/master/cmd/kubeadm/app/master/manifests.go#L41 )
If the file is not in this location the controller-manager will fail to start, as he is given the --cloud-provider option without --cloud-config. (--cloud-config will only be used when  `/etc/kubernetes/cloud-config` exists https://github.com/kubernetes/kubernetes/blob/master/cmd/kubeadm/app/master/manifests.go#L367 )
2016-12-15 14:58:46 +01:00
Eric Baum 73d782abe1 Merge branch 'master' into UC-design-patch 2016-12-15 05:13:13 +00:00
Alejandro Escobar 8d8c5f9c0a updated the links to documents that do not exists locally but remotely in github. These links are broken online.
missed a link.
2016-12-14 18:56:27 -08:00
Steve Perry 2a0c64f9bd Merge pull request #1954 from janetkuo/fix-link
In DaemonSet doc, link to node selection doc instead of repo
2016-12-14 16:59:34 -08:00
Steve Perry 1c678270aa Merge branch 'master' into fix-link 2016-12-14 16:57:11 -08:00
Jimmy Cuadra a1dededa56 Fix the formatting of bullet lists on the kubelet auth page. 2016-12-14 15:52:22 -08:00
Jared 4f84ed6610 Merge pull request #1942 from benbalter/jekyll-plugins
Rely more official Jekyll plugins for common behavior
2016-12-14 15:30:05 -08:00
Ben Balter c7a37cf626 Merge branch 'master' into jekyll-plugins 2016-12-14 18:09:10 -05:00
Eric Baum 1c9c49a216 Merge branch 'master' into UC-design-patch 2016-12-14 23:03:05 +00:00