Compare commits

...

9 Commits

Author SHA1 Message Date
Jerome Petazzoni
c613f2ab6e fix-redirects.sh: adding forced redirect 2020-04-07 16:48:20 -05:00
Bridget Kromhout
f7e789ca3c Merge pull request #148 from jpetazzo/master
bring branch up to date
2018-03-13 21:46:23 +01:00
Bridget Kromhout
4eacf27661 Merge pull request #142 from bridgetkromhout/boosterconf2018
Boosterconf2018 branch updates from master
2018-03-07 18:37:25 -06:00
Bridget Kromhout
11dab4b7e2 Merge branch 'master' into boosterconf2018 2018-03-07 18:30:53 -06:00
Jérôme Petazzoni
d1445359e0 Merge pull request #139 from bridgetkromhout/boosterconf2018
Boosterconf2018 fork update
2018-03-06 18:00:44 -08:00
Bridget Kromhout
2e2d066c14 switching title and bridget-specifics. 2018-03-05 20:13:32 -06:00
Bridget Kromhout
5816d23134 Merge branch 'master' into boosterconf2018 2018-03-05 20:07:37 -06:00
Jérôme Petazzoni
1d5302bc00 Merge pull request #136 from bridgetkromhout/boosterconf2018
Adding redirect for Boosterconf 2018
2018-03-05 14:12:02 -08:00
Bridget Kromhout
b7f6dce0c1 Adding redirect for Boosterconf 2018 2018-03-05 15:13:27 -06:00
2 changed files with 4 additions and 4 deletions

1
slides/_redirects Normal file
View File

@@ -0,0 +1 @@
/ /kube-halfday.yml.html 200!

View File

@@ -1,6 +1,5 @@
title: |
Deploying and Scaling Microservices
with Kubernetes
Kubernetes 101
#chat: "[Slack](https://dockercommunity.slack.com/messages/C7GKACWDV)"
@@ -12,7 +11,7 @@ exclude:
chapters:
- common/title.md
- logistics.md
- logistics-bridget.md
- kube/intro.md
- common/about-slides.md
- common/toc.md
@@ -36,4 +35,4 @@ chapters:
- kube/rollout.md
- kube/whatsnext.md
- common/thankyou.md
- kube/links.md
- kube/links-bridget.md