Commit Graph

2498 Commits (d5188c7e80ed224676c4ed8eede007a8151b8004)

Author SHA1 Message Date
bprashanth d5188c7e80 Write a source-ip tutorial. 2016-12-05 18:11:07 -08:00
devin-donnelly f9b5c0649f Merge pull request #1823 from devin-donnelly/release-1.5
Merge latest from Master into Release 1.5
2016-11-29 17:13:48 -08:00
Devin Donnelly 9b2500fb60 Merge remote-tracking branch 'upstream/master' into release-1.5 2016-11-29 17:08:38 -08:00
Jared 3392a989d7 Merge pull request #1764 from craigbox/patch-2
Add license to footer
2016-11-29 08:57:49 -08:00
Jared 5d163bd4b7 Merge branch 'master' into patch-2 2016-11-29 08:55:40 -08:00
Jared 5c7785d30b Merge pull request #1763 from craigbox/patch-1
Update LICENSE to CC BY SA 4.0
2016-11-29 08:55:26 -08:00
Jared b7ea97576a Merge branch 'master' into patch-2 2016-11-29 08:49:36 -08:00
Jared dad3a4e329 Merge branch 'master' into patch-1 2016-11-29 08:43:45 -08:00
Steve Perry db33439777 Merge pull request #1782 from steveperry-53/templates
Remove old template topics.
2016-11-28 15:07:49 -08:00
devin-donnelly c180ba163b Merge pull request #1620 from dixudx/keystone-ca-cert
add doc for new flag experimental-keystone-ca-file
2016-11-28 14:05:37 -08:00
steveperry-53 a4f8d3c06a Remove old template topics. 2016-11-28 12:32:23 -08:00
Steve Perry 9163261c97 Merge pull request #1798 from steveperry-53/landing-pages
Update Tutorial and Task landing pages.
2016-11-28 11:56:40 -08:00
steveperry-53 a856ab1549 Update Tutorial and Task landing pages. 2016-11-28 11:49:17 -08:00
craigbox 454c43287b Merge branch 'master' into patch-2 2016-11-28 15:15:32 +00:00
devin-donnelly efb7f65b5d Merge pull request #1775 from jpeterson88/dev
Fix for Issue 1767
2016-11-23 14:03:53 -08:00
devin-donnelly 804ebfee55 Merge pull request #1776 from wilk/patch-1
updated dockerimage link
2016-11-23 14:02:33 -08:00
devin-donnelly 09429cb488 Merge pull request #1777 from bboreham/weave-npc
Add Weave to the list of NetworkPolicy implementations
2016-11-23 13:35:34 -08:00
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 c01aaba156 Add Weave to the list of NetworkPolicy implementations 2016-11-23 14:32:59 +00:00
Bryan Boreham 5a54ed400c Clarify that no add-ons are preferred above others 2016-11-23 14:25:09 +00:00
Vincenzo Ferrari 1f68526159 updated dockerimage link
removed dead link of dockerimage
2016-11-23 11:12:07 +01:00
Justin Peterson 1bcb4cd558 Fix for Issue 1767 2016-11-22 19:15:40 -08:00
Jared 29607341ec Merge branch 'master' into patch-2 2016-11-22 12:34:07 -08:00
Jared 1c415db281 Merge branch 'master' into patch-1 2016-11-22 12:34:02 -08: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
Jared b5ec115d6f Merge branch 'master' into patch-2 2016-11-22 12:28:16 -08:00
Jared 8f198e484e Merge branch 'master' into patch-1 2016-11-22 12:28:11 -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
craigbox e9591bb3ee Add license to footer
- Change "Kubernetes", which is not a thing you can assign copyright to, to "The Kubernetes Authors", in line with comments in source files.  This may or may not be more appropriate to assign copyright to CNCF.
- Add link to LICENSE with CC BY SA text, which will only be true when #1763 is merged.
- I don't think you'll like the CSS, but without the 'light-text' tag you get a blue/purple link.
2016-11-22 13:22:38 +00:00
craigbox 54cd5d115b Update LICENSE to CC BY SA 4.0
Text copied from https://creativecommons.org/licenses/by/4.0/legalcode.txt.
2016-11-22 13:02:02 +00:00
Di Xu b8d8c1b596 add doc for experimental-keystone-ca-file flag 2016-11-22 10:39:40 +08: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