Compare commits

...

5 Commits

Author SHA1 Message Date
Jerome Petazzoni
56f67aedb3 fix-redirects.sh: adding forced redirect 2020-04-07 16:56:32 -05:00
Jerome Petazzoni
cb47280632 Merge branch 'master' into oscon2018 2018-07-17 10:55:25 -05:00
Bridget Kromhout
05588a86d9 Merge pull request #312 from jpetazzo/master
updates from master
2018-07-16 19:02:47 -05:00
Bridget Kromhout
59ffe6b6c8 Merge pull request #307 from bridgetkromhout/oscon2018
Adding oscon-specific details
2018-07-15 13:18:48 -05:00
Bridget Kromhout
54f1300305 Adding oscon-specific details 2018-07-15 13:16:27 -05:00
3 changed files with 22 additions and 6 deletions

1
slides/_redirects Normal file
View File

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

View File

@@ -2,8 +2,8 @@ title: |
Kubernetes 101
#chat: "[Slack](https://dockercommunity.slack.com/messages/C7GKACWDV)"
#chat: "[Gitter](https://gitter.im/jpetazzo/training-20180413-paris)"
chat: "In person!"
chat: "[Gitter](https://gitter.im/jpetazzo/workshop-20180717-portland)"
#chat: "In person!"
gitrepo: github.com/jpetazzo/container.training

View File

@@ -2,15 +2,30 @@
- Hello! We are:
- .emoji[✨] Bridget ([@bridgetkromhout](https://twitter.com/bridgetkromhout))
- .emoji[✨] Bridget Kromhout ([@bridgetkromhout](https://twitter.com/bridgetkromhout))
- .emoji[🌟] Joe ([@joelaha](https://twitter.com/joelaha))
- .emoji[🌟] Joe Laha ([@joelaha](https://twitter.com/joelaha))
- The workshop will run from 13:30-16:45
- .emoji[💁🏻‍♀️] Karen Chu ([@karenhchu](https://twitter.com/karenhchu))
- There will be a break from 15:00-15:15
- .emoji[🐳] Jérôme Petazzoni ([@jpetazzo](https://twitter.com/jpetazzo)) (joining us from Berlin in the chat room!)
- The workshop will run from 9:00-12:30
- There will be a break from 10:30-11:00
- Feel free to interrupt for questions at any time
- *Especially when you see full screen container pictures!*
---
## Say hi!
- We encourage networking at [#oscon](https://twitter.com/hashtag/oscon?f=tweets&vertical=default&src=hash)
- Take a minute to introduce yourself to your neighbors
- Tell them where you're from (where you're based out of & what org you work at)
- Share what you're hoping to learn in this session! .emoji[✨]