Commit Graph

2863 Commits (6101aec4a03285228accd2376f8a73783c086814)

Author SHA1 Message Date
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
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
Phillip Wittrock fd84eb1ad3 Merge branch 'master' into ae/gitignore 2016-12-13 12:32:46 -08:00
Steve Perry 89c6b0abee Merge pull request #1861 from steveperry-53/readme
Move README content to contribution section.
2016-12-13 11:22:10 -08:00
steveperry-53 aeefabff87 Move README content to contribution section. 2016-12-13 11:15:37 -08:00
Alejandro Escobar 00abb3c843 added .idea to gitignore since this is a viable ide to write markdown text with. 2016-12-13 11:14:35 -08:00
hasahni dd1fa0039d Add Nuage as a networking plugin for Kubernetes. (#1849) 2016-12-13 11:06:35 -08:00
devin-donnelly 6aca6ae5d0 Merge pull request #1913 from Nanopy/UC-content-patch
Minor content updates to Home page, case studies, and partners
2016-12-13 12:05:30 -05:00
devin-donnelly 94e38475e9 Merge pull request #1929 from jeffmendoza/trademark-footer
Linux Foundation trademark notice. Fix #1846
2016-12-13 12:04:38 -05:00
Ahmet Alp Balkan dafc22c79a Add empty space before code blocks to render
If there is no empty space before the 3-backtick code blocks,
they are rendered incorrectly on the website.
2016-12-12 21:03:11 -08:00
Ahmet Alp Balkan e8b2830a07 Fix bullet list syntax 2016-12-12 20:59:10 -08:00
Jared 077b036c07 Update statefulsets.md 2016-12-12 19:03:38 -08:00
Jared ab115ac0bf Update statefulsets.md 2016-12-12 18:58:23 -08:00
Jared dab1fba837 Update statefulsets.md 2016-12-12 18:54:37 -08:00
Saad Ali 842d7bca8e Merge pull request #1795 from sakshamsharma/patch-1
Update path to build directory
2016-12-12 17:58:28 -08:00
Saad Ali fd5201a540 Merge branch 'master' into patch-1 2016-12-12 17:53:28 -08:00
grodrigues3 4bdcb95da8 Merge pull request #1934 from kubernetes/release-1.5
Merge Release 1.5 to Master, Publishing 1.5 docs live
2016-12-12 17:50:20 -08:00
Saad Ali 4ba5c70d9b Merge branch 'master' into release-1.5 2016-12-12 16:21:05 -08:00
Jared 23a5b4a78d Merge branch 'master' into patch-1 2016-12-12 13:10:32 -08:00
Phillip Wittrock 62fc011409 Merge pull request #1931 from steveperry-53/not-persistent
Remove "persistent" from emptyDir section.
2016-12-12 12:02:58 -08:00
Saksham Sharma e15e7ab92f Update path to build directory
Changed in release 1.5
2016-12-13 01:29:46 +05:30
devin-donnelly ff3d9225ab Merge pull request #1772 from madhusudancs/fed-ing-workaround
Document the workaround for the Federated Ingress flapping healthchecks problem.
2016-12-12 14:49:50 -05:00
devin-donnelly ea411fb18d Update federated-ingress.md 2016-12-12 14:41:51 -05:00
devin-donnelly 594f1c76e3 Merge pull request #1594 from jsafrane/secret-type
Update documentation of configuration of dynamic provisioning
2016-12-12 14:38:54 -05:00
Jeff Mendoza 082f4099d0 Linux Foundation trademark notice. Fix #1846 2016-12-12 11:28:37 -08:00
devin-donnelly e482c3527e Merge pull request #1808 from caesarxuchao/gc-minor
Synchronous garbage collection is not going to make 1.5
2016-12-12 14:27:21 -05:00
devin-donnelly 1761212ac3 Update garbage-collection.md 2016-12-12 14:27:05 -05:00
steveperry-53 f896de02c5 Remove "persistent" from emptyDir section. 2016-12-12 11:07:31 -08:00
devin-donnelly a51dba139a Merge pull request #1930 from kubernetes/devin-donnelly-patch-2
Update guides.yml to add a link and title for Windows Server Getting Started
2016-12-12 13:59:03 -05:00
devin-donnelly 1c962cda28 Merge pull request #1922 from janetkuo/ss-concept-404
Fix broken link from SS concept to upgrade task
2016-12-12 13:57:26 -05:00
devin-donnelly 10782dac27 Update guides.yml 2016-12-12 13:46:56 -05:00
devin-donnelly 449ac76a6c Merge pull request #1927 from kubernetes/devin-donnelly-patch-1
Add standard markdown header to windows/index.md
2016-12-12 13:45:36 -05:00
devin-donnelly 8f0f15e1a1 Update index.md 2016-12-12 13:44:41 -05:00
devin-donnelly 34eb94424d Update index.md 2016-12-12 13:31:22 -05:00
devin-donnelly 19cbca1a21 Merge pull request #1920 from nikhiljindal/swaggerUI1.5
Replacing reference to swagger UI by API reference docs
2016-12-12 10:20:52 -08:00
Janet Kuo a4248ed5aa Merge pull request #1854 from bryk/typ
Fix link references in UI docs
2016-12-12 09:50:01 -08:00
Phillip Wittrock 94648ba021 Merge pull request #1855 from ankurshukla/master
added harbor and kubernetic to the partners page
2016-12-12 09:08:17 -08:00
Janet Kuo 20d9dc0b4c Fix broken link from SS concept to upgrade task 2016-12-11 22:36:19 -08:00