From 65faa4507c3ff77aec3f11aabd7851683e8e9c59 Mon Sep 17 00:00:00 2001 From: Bridget Kromhout Date: Wed, 27 Jun 2018 08:12:40 +0200 Subject: [PATCH 1/5] 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 d215336d..7251720d 100644 --- a/slides/kube/versions-k8s.md +++ b/slides/kube/versions-k8s.md @@ -1,6 +1,6 @@ ## Versions installed -- Kubernetes 1.10.4 +- Kubernetes 1.10.5 - Docker Engine 18.03.1-ce - Docker Compose 1.21.1 From 2585daac9b9cebdc90c522ee12129bdc87c28103 Mon Sep 17 00:00:00 2001 From: ctas582 Date: Thu, 28 Jun 2018 14:20:54 +0100 Subject: [PATCH 2/5] Force rng to be single threaded (#293) --- dockercoins/rng/rng.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dockercoins/rng/rng.py b/dockercoins/rng/rng.py index d9376c51..b327e922 100644 --- a/dockercoins/rng/rng.py +++ b/dockercoins/rng/rng.py @@ -28,5 +28,5 @@ def rng(how_many_bytes): if __name__ == "__main__": - app.run(host="0.0.0.0", port=80) + app.run(host="0.0.0.0", port=80, threaded=False) From db5d5878f54a1e9e7616a96bf2f83dc054804640 Mon Sep 17 00:00:00 2001 From: Jerome Petazzoni Date: Tue, 3 Jul 2018 10:47:41 -0500 Subject: [PATCH 3/5] Switch to two-line format since our titles are so long --- slides/index.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/slides/index.py b/slides/index.py index 453827c1..2c4bf9e8 100755 --- a/slides/index.py +++ b/slides/index.py @@ -15,10 +15,13 @@ TEMPLATE=""" {% for item in coming_soon %} - {{ item.prettydate }}: {{ item.title }} at {{ item.event }} in {{ item.city }} + {{ item.title }} {% if item.slides %}{% endif %} + + Scheduled {{ item.prettydate }} at {{ item.event }} in {{item.city }}. + {% endfor %} {% endif %} @@ -27,10 +30,14 @@ TEMPLATE=""" {% for item in past_workshops[:5] %} - {{ item.prettydate }}: {{ item.title }} {% if item.event %}at {{ item.event }} {% endif %} {% if item.city %} in {{ item.city }} {% endif %} + {{ item.title }} {% if item.video %}{% endif %} + + Delivered {{ item.prettydate }} at {{ item.event }} in {{item.city }}. + + {% endfor %} {% if past_workshops[5:] %} From 3393563498b3f09947e0b32144f30405de091cf7 Mon Sep 17 00:00:00 2001 From: Bridget Kromhout Date: Fri, 6 Jul 2018 16:11:37 -0500 Subject: [PATCH 4/5] 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 5/5] 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