From c575cb9cd5c466b9b97e10e21f23d2232f14715b Mon Sep 17 00:00:00 2001 From: Bridget Kromhout Date: Wed, 23 May 2018 10:18:02 -0500 Subject: [PATCH 1/2] New events (and old event to past) --- slides/index.html | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/slides/index.html b/slides/index.html index 3065f484..09973c2d 100644 --- a/slides/index.html +++ b/slides/index.html @@ -71,11 +71,6 @@ thing for now (stay tuned...) --> - - May 17th, 2018: Revolution Conf Virginia Beach - Docker 101 -   - - June 12th, 2018: Velocity San Jose - Kubernetes 101 @@ -83,14 +78,33 @@ thing for now (stay tuned...) + + June 27th, 2018: devopsdays Amsterdam - Kubernetes 101 +   + + + + July 17th, 2018: OSCON - Kubernetes 101   + + Oct 1st, 2018: Velocity New York - Kubernetes 101 +   + + + + Past workshops + + May 17th, 2018: Revolution Conf Virginia Beach - Docker 101 + + + May 10th, 2018: NDC Minnesota - Kubernetes 101 From a7d89062cf8fc8cb13ac371b58190bd1729eb6d1 Mon Sep 17 00:00:00 2001 From: Bridget Kromhout Date: Mon, 4 Jun 2018 15:43:30 -0500 Subject: [PATCH 2/2] Bumping engine version --- 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 6a63ca82..6d3903b6 100644 --- a/slides/kube/versions-k8s.md +++ b/slides/kube/versions-k8s.md @@ -1,7 +1,7 @@ ## Versions installed - Kubernetes 1.10.3 -- Docker Engine 18.03.0-ce +- Docker Engine 18.03.1-ce - Docker Compose 1.21.1