Merge pull request #303 from jpetazzo/master

bringing branch up to date
This commit is contained in:
Bridget Kromhout
2018-07-10 07:34:08 -05:00
committed by GitHub
2 changed files with 9 additions and 1 deletions

View File

@@ -1,3 +1,11 @@
- date: 2018-07-12
city: Minneapolis, MN
country: us
event: devopsdays Minneapolis
title: Kubernetes 101
speaker: "ashleymcnamara, bketelsen"
attend: https://www.devopsdays.org/events/2018-minneapolis/registration/
- date: 2018-10-01
city: New York, NY
country: us

View File

@@ -1,6 +1,6 @@
## Versions installed
- Kubernetes 1.10.5
- Kubernetes 1.11.0
- Docker Engine 18.03.1-ce
- Docker Compose 1.21.1