From 54e7d10226918f90f0e58249d4003d27f8aabb78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Petazzoni?= Date: Sun, 19 Nov 2017 17:45:24 -0800 Subject: [PATCH 1/2] Add internal training --- slides/index.html | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/slides/index.html b/slides/index.html index 860d6f58..3df9c185 100644 --- a/slides/index.html +++ b/slides/index.html @@ -66,15 +66,21 @@ Coming soon at a conference near you - - --> - + Past workshops From f264838ec5fedebffc775d56bd7d82c0ba817794 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Petazzoni?= Date: Sun, 19 Nov 2017 23:34:27 -0800 Subject: [PATCH 2/2] Update versions --- slides/kube/versions-k8s.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/slides/kube/versions-k8s.md b/slides/kube/versions-k8s.md index 795248b6..d2b0a68c 100644 --- a/slides/kube/versions-k8s.md +++ b/slides/kube/versions-k8s.md @@ -1,8 +1,8 @@ ## Brand new versions! - Kubernetes 1.8 -- Docker Engine 17.10 -- Docker Compose 1.16 +- Docker Engine 17.11 +- Docker Compose 1.17 .exercise[