From 3393563498b3f09947e0b32144f30405de091cf7 Mon Sep 17 00:00:00 2001 From: Bridget Kromhout Date: Fri, 6 Jul 2018 16:11:37 -0500 Subject: [PATCH 1/3] Adding MSP 2018 --- slides/index.yaml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/slides/index.yaml b/slides/index.yaml index 9d3ea6e9..2d570c5e 100644 --- a/slides/index.yaml +++ b/slides/index.yaml @@ -1,3 +1,12 @@ +- date: 2018-07-12 + city: Minneapolis, MN + country: us + event: devopsdays Minneapolis + title: Kubernetes 101 + speaker: "ashleymcnamara, bketelsen" + slides: https://devopsdaysmsp2018.container.training + attend: https://www.devopsdays.org/events/2018-minneapolis/registration/ + - date: 2018-10-01 city: New York, NY country: us From 971b5b0e6dac21b0e4c92bc36da121ec2780e5bb Mon Sep 17 00:00:00 2001 From: Bridget Kromhout Date: Tue, 10 Jul 2018 05:45:22 -0500 Subject: [PATCH 2/3] Let's not link quite yet --- slides/index.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/slides/index.yaml b/slides/index.yaml index 2d570c5e..0b20ce33 100644 --- a/slides/index.yaml +++ b/slides/index.yaml @@ -4,7 +4,6 @@ event: devopsdays Minneapolis title: Kubernetes 101 speaker: "ashleymcnamara, bketelsen" - slides: https://devopsdaysmsp2018.container.training attend: https://www.devopsdays.org/events/2018-minneapolis/registration/ - date: 2018-10-01 From 96a76d2a19fc2bc36fd47776959c16751349c248 Mon Sep 17 00:00:00 2001 From: Bridget Kromhout Date: Tue, 10 Jul 2018 06:17:07 -0500 Subject: [PATCH 3/3] Version bump --- slides/kube/versions-k8s.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/slides/kube/versions-k8s.md b/slides/kube/versions-k8s.md index 7251720d..1273f1ca 100644 --- a/slides/kube/versions-k8s.md +++ b/slides/kube/versions-k8s.md @@ -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