Commit Graph

2912 Commits (a3a3634fdb7cc33e7c2dc365cc3bc37d6115e6f3)

Author SHA1 Message Date
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
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
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
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
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
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
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
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
Madhusudan.C.S a3a3c2fd80 Removed backticks from the left nav entries. 2016-12-14 14:51:55 -08:00
Kenneth Owens e9cf14ffb4 Adds zookeeper example (#1894)
* Initial commit

* Adds section for cleanup
Corrects some spelling errors
decapitalizes liveness and readiness

* Adds test for zookeeper example

* Address enisoc review

* Remove space between shell and raw annotation

* Remove extranous inserted text

* Remove fencing statement

* Modify sentence for grammer

* refocus to zookeeper with some loss of generality

* Spelling, Grammar, DNS link

* update to address foxish comments
2016-12-14 13:56:21 -08:00
Jared 681114409f Merge pull request #1917 from craigbox/patch-4
Adjust header formatting
2016-12-14 11:46:56 -08:00
Jared a473bdbaf2 Merge branch 'master' into patch-4 2016-12-14 11:35:17 -08:00
Janet Kuo f664e4c65a In DaemonSet doc, link to node selection doc instead of repo 2016-12-14 11:21:28 -08:00
Phillip Wittrock e1de6edc91 Merge pull request #1896 from steveperry-53/secrets
Write new Task: Distributing Credentials Securely.
2016-12-13 16:29:47 -08:00
Phillip Wittrock 954074a838 Merge branch 'master' into secrets 2016-12-13 16:27:57 -08:00
Madhusudan.C.S 93ffad35f2 Fix URL typo and whitespace. 2016-12-13 15:27:23 -08:00
Jared cd65fa650f Merge pull request #1916 from xialonglee/fix-typo
Fix typo.
2016-12-13 15:02:25 -08:00
Jared 04f6af0948 Merge branch 'master' into fix-typo 2016-12-13 14:59:15 -08:00
Jared 6101aec4a0 Merge pull request #1936 from ahmetalpbalkan/patch-8
Add empty space before code blocks to render
2016-12-13 14:58:33 -08:00
Jared c26a4d6789 Merge branch 'master' into patch-8 2016-12-13 14:56:15 -08:00
Jared 105a6d9fa5 Merge pull request #1935 from ahmetalpbalkan/patch-7
Fix bullet list syntax.  Thanks for submitting the fix!
2016-12-13 14:40:50 -08:00
Jared c13e73544c Merge branch 'master' into patch-7 2016-12-13 14:38:34 -08:00
Steve Perry 4edb86eb4c Merge pull request #1946 from janetkuo/fix-merge-conflicts
Fix merge conflict in partners/index.html
2016-12-13 14:09:10 -08:00
Janet Kuo a11cdd5a6e Fix merge conflict in partners/index.html 2016-12-13 14:03:02 -08:00
devin-donnelly 9117f7a9ac Merge pull request #1945 from janetkuo/update-generated-docs
Update imported docs for 1.5
2016-12-13 16:58:51 -05:00
Janet Kuo 6535ffad28 Merge branch 'master' into update-generated-docs 2016-12-13 13:56:50 -08:00
Janet Kuo ad02b08517 Manually point api-reference to v1.5 2016-12-13 13:53:02 -08:00
Janet Kuo 28899d6ec6 Run update-imported-docs.sh 2016-12-13 13:44:13 -08:00
Janet Kuo 0634802720 Bump update-imported-docs.sh to 1.5, and remove files deleted in 1.5 2016-12-13 13:42:50 -08:00
steveperry-53 c8d67ab182 Addressed comments by pwittrock. 2016-12-13 13:25:06 -08:00
steveperry-53 2fa89315eb Write new Task: Distributing Credentials Securely. 2016-12-13 13:25:06 -08:00
Steve Perry 0c4de02185 Merge pull request #1875 from steveperry-53/volumes-for-storage
Write new task: Configuring a Pod to Use a Volume for Storage
2016-12-13 13:11:40 -08:00
steveperry-53 922e60eff5 Write new task: Configuring a Pod to Use a Volume for Storage. 2016-12-13 13:07:47 -08:00
Phillip Wittrock c185536d7d Merge pull request #1941 from alejandroEsc/ae/gitignore
added .idea to gitignore
2016-12-13 12:38:59 -08:00