Commit Graph

2465 Commits (92225fab5928e2cbbc623f7ce3655fd063345a62)

Author SHA1 Message Date
devin-donnelly 92225fab59 Merge pull request #1778 from bboreham/alpha-sorting
Clarify that no add-ons are preferred above others
2016-11-23 13:31:12 -08:00
Bryan Boreham 5a54ed400c Clarify that no add-ons are preferred above others 2016-11-23 14:25:09 +00:00
Jared 3271e982d6 Merge pull request #1765 from craigbox/patch-3
Add license info to documentation docs
2016-11-22 12:31:02 -08:00
Jared 1940abddd4 Merge branch 'master' into patch-3 2016-11-22 12:28:27 -08:00
Maciej Szulik b720f838a3 Merge pull request #1651 from soltysh/rename_scheduledjob
Rename ScheduledJobs to CronJobs
2016-11-22 20:11:51 +01:00
Maciej Szulik ab09b11359 Rename ScheduledJobs to CronJobs 2016-11-22 19:59:30 +01:00
Maciej Szulik 9544c80dee Add ScheduledJobs to menu and remove future work section from jobs 2016-11-22 19:56:31 +01:00
craigbox aa89153cfe Add license info to documentation docs
- Add link to the CC BY SA license
- Remove Google CLA, as we're now only using the LF CLA
- Add "Foundation" to the "Linux CLA"
2016-11-22 13:26:49 +00:00
devin-donnelly 01935a77ad Merge pull request #1522 from sjenning/fix-autoscaler-doc
AUTOSCALER not AUTOSCALING
2016-11-21 16:57:56 -08:00
devin-donnelly 886ca4acdb Merge pull request #1596 from CaoShuFeng/enhance-cni
Add details about loopback cni plugin
2016-11-21 16:54:43 -08:00
devin-donnelly 873cef7109 Merge pull request #1615 from linfan/master
Add limitation note of using host-port
2016-11-21 16:49:32 -08:00
devin-donnelly fb38685529 Merge pull request #1617 from mkulke/adjust-node-hostname-docs
Updated the NodeHostname entry.
2016-11-21 16:49:07 -08:00
devin-donnelly 84253dcbdf Merge pull request #1623 from w0mbat/init-container-beta-update
Updated documentation to use beta version of init-containers
2016-11-21 16:45:48 -08:00
devin-donnelly 2e007abdb9 Merge pull request #1649 from kubernetes/jaredbhatti-patch-1
creating contributing.md
2016-11-21 16:42:53 -08:00
devin-donnelly 74dc6cf45d Merge pull request #1630 from blankenhaus/master
Layer 3 <=> layer 4
2016-11-21 16:42:40 -08:00
Jared ea47d175a6 Merge branch 'master' into jaredbhatti-patch-1 2016-11-21 16:41:02 -08:00
devin-donnelly 94149087ef Merge pull request #1638 from tremaineeto/patch-1
Fixed typo
2016-11-21 16:40:27 -08:00
devin-donnelly 7c86da9e9a Merge pull request #1642 from travissalascox/master
Update dns.md
2016-11-21 16:39:22 -08:00
devin-donnelly 4c099553b4 Merge pull request #1647 from StephenKing/patch-1
configuring-containers: Fix syntax highlight
2016-11-21 16:38:42 -08:00
devin-donnelly 157ab0d316 Merge pull request #1654 from castrojo/master
Update Ubuntu information.
2016-11-21 16:15:46 -08:00
devin-donnelly 7c8256aa4d Merge pull request #1675 from cdrage/remove-stars
Remove "stars" ratings from each page.
2016-11-21 15:15:42 -08:00
devin-donnelly 3aafad63f1 Merge pull request #1679 from StackPointCloud/partner/stackpoint.io
Added Stackpoint.io to the Technology and Services Partner sections
2016-11-21 15:15:00 -08:00
Jared 3d3e7326a3 Merge branch 'master' into master 2016-11-21 15:07:07 -08:00
devin-donnelly 7be9e1b694 Merge pull request #1667 from bdurette/patch-1
Typo fix
2016-11-21 14:58:57 -08:00
devin-donnelly 9593893669 Merge pull request #1689 from justinsb/remove_old_coreos_multinode_cluster_guide
Remove unmaintained coreos multinode cluster
2016-11-21 14:49:56 -08:00
devin-donnelly 9d72e1d548 Merge pull request #1709 from ahawtho/patch-1
Fix shell example in sharing-clusters.md
2016-11-21 14:48:10 -08:00
devin-donnelly c3de6fa5e7 Merge pull request #1700 from chrismarino/chrismarino-patch
Invalid characters
2016-11-21 14:47:46 -08:00
devin-donnelly ca7e03fd77 Merge pull request #1714 from bacongobbler/rbac-move-superuser-flag
move "Privilege Escalation Prevention and Bootstrapping closer
2016-11-21 14:47:11 -08:00
devin-donnelly 2f26823b50 Merge pull request #1721 from rsmitty/master
Very basic kubeadm reset command formatting fix.
2016-11-21 14:40:34 -08:00
devin-donnelly 8d36e87929 Merge pull request #1723 from ahmetalpbalkan/patch-4
service-accounts.md: Better paragraph flow
2016-11-21 14:38:39 -08:00
Jared 3dc6120e8e Merge branch 'master' into adjust-node-hostname-docs 2016-11-21 14:33:26 -08:00
Jared 79821557f5 Merge branch 'master' into init-container-beta-update 2016-11-21 14:28:56 -08:00
devin-donnelly 20d6b55841 Merge pull request #1735 from johananl/patch-3
Mention kubectl as a requirement for running kops
2016-11-21 14:23:59 -08:00
devin-donnelly 560aa4e777 Merge pull request #1736 from caseydavenport/remove-old-guides
Remove outdated Calico guides in favor of kubeadm
2016-11-21 14:23:35 -08:00
devin-donnelly 0d3e850b0c Merge pull request #1738 from ahmetalpbalkan/patch-6
Fix code block rendering issue
2016-11-21 14:22:56 -08:00
devin-donnelly 86455ca0f0 Merge pull request #1739 from erikus/patch-1
Update "kubectl docker" command to include "--"
2016-11-21 14:22:06 -08:00
Jared b7b599698d Merge pull request #1587 from Dominic001/patch-2
more explicit etcdctl description
2016-11-21 14:21:58 -08:00
Jared bd02d27d11 Merge branch 'master' into patch-2 2016-11-21 14:21:11 -08:00
devin-donnelly 23e3f55e3b Merge pull request #1743 from lfaraone/patch-1
Use HTTPS links for all command line invocations
2016-11-21 14:16:37 -08:00
devin-donnelly aae7524cbc Merge pull request #1741 from rfay/20161120_fix_broken_pv
Fix broken path in pv configuration, minor doc improvement
2016-11-21 14:16:10 -08:00
devin-donnelly ab80f27df2 Merge pull request #1742 from caseydavenport/update-calico-links
Update Calico links to new docs
2016-11-21 14:15:42 -08:00
Jared 71f6381067 Update index.md 2016-11-21 14:14:15 -08:00
Jared fe22efc9d5 Merge pull request #1533 from roopakparikh/master
Added Platform9.com solutions at couple of Places
2016-11-21 14:13:26 -08:00
Jared 7801a9a735 Merge branch 'master' into master 2016-11-21 14:13:18 -08:00
devin-donnelly a1d0484bfc Merge pull request #1748 from liangxiaoping/new_branch
Modify some hyperlink location in binary_release.md
2016-11-21 14:09:24 -08:00
Jared 1e1db181e1 Merge branch 'master' into patch-2 2016-11-21 14:07:47 -08:00
Jared a2dff8d479 Add TOC 2016-11-21 14:07:09 -08:00
devin-donnelly 4b4968c299 Merge pull request #1750 from berrange/coreos-typo
libvirt-coreos: fix typo s/libvert/libvirt/
2016-11-21 14:06:48 -08:00
Jared c54d8252fe Merge pull request #1598 from deads2k/front-proxy
document authenticating proxy
2016-11-21 14:05:01 -08:00
Jared 979911c86d Merge branch 'master' into master 2016-11-21 13:59:25 -08:00