Commit 03b01a28 authored by Tony Wildish's avatar Tony Wildish
Browse files

resolve merge conflict

parents 03740c15 6841eae6
......@@ -36,7 +36,9 @@ Course guidelines
+-----------------------------+----------+-------------------------------------------------------------------------------------------------------+
| 05 Oct 2020, 14:40 - 14:50 | 10 min | `EBI Cloud Services <../../_static/pdf/resops2020/EBI_Cloud_Services_v1.0.pdf>`_ |
+-----------------------------+----------+-------------------------------------------------------------------------------------------------------+
| 05 Oct 2020, 14:50 - 15:30 | 40 min | `Porting apps into clouds <../../_static/pdf/resops2019/PortingResearchPipelinesintoClouds.pdf>`_ |
| 05 Oct 2020, 14:40 - 15:20 | 40 min | `Porting apps into clouds: 1 <../../_static/pdf/resops2020/PortingResearchPipelinesintoClouds1.pdf>`_ |
| | | `Porting apps into clouds: 2 <../../_static/pdf/resops2020/PortingResearchPipelinesintoClouds2.pdf>`_ |
| | | `Porting apps into clouds: 3 <../../_static/pdf/resops2020/PortingResearchPipelinesintoClouds3.pdf>`_ |
+-----------------------------+----------+-------------------------------------------------------------------------------------------------------+
| 05 Oct 2020, 15:30 - 16:30 | 60 min | `Creating Containers with Docker <../../_static/pdf/resops2020/Creating-Containers-with-Docker.pdf>`_ |
+-----------------------------+----------+-------------------------------------------------------------------------------------------------------+
......@@ -57,16 +59,16 @@ Course guidelines
+-----------------------------+----------+-------------------------------------------------------------------------------------------------------+
| 08 Oct 2020, 14:00 - 15:00 | 60 min | `Kubernetes 101 <../../_static/pdf/resops2019/Kubernetes-101.pdf>`_ |
+-----------------------------+----------+-------------------------------------------------------------------------------------------------------+
| 08 Oct 2020, 15:00 - 17:00 | 120 min | `Overview <../../_static/pdf/resops2019/KubernetesPracticals.pdf>`_ |
| 08 Oct 2020, 15:00 - 17:00 | 120 min | `Overview <../../_static/pdf/resops2020/KubernetesPracticalsDemo.pdf>`_ |
| | | / `Kubernetes (Demo) <Kubernetes-Demo-2019.html>`_ |
+-----------------------------+----------+-------------------------------------------------------------------------------------------------------+
| 08 Oct 2020, 17:00 - 17:45 | 45 min | `Overview <../../_static/pdf/resops2019/KubernetesPracticals.pdf>`_ |
| 08 Oct 2020, 17:00 - 17:45 | 45 min | `Overview <../../_static/pdf/resops2020/KubernetesPracticals.pdf>`_ |
| | | / `Kubernetes Practical <Minikube-and-NGINX-Practical-2019.html>`_ |
+-----------------------------+----------+-------------------------------------------------------------------------------------------------------+
| 08 Oct 2020 | 180 min | `Overview <../../_static/pdf/resops2019/KubernetesPracticals.pdf>`_ |
| 08 Oct 2020 | 180 min | `Overview <../../_static/pdf/resops2020/KubernetesAdvancedPracticals.pdf>`_ |
| | | / `Advanced Kubernetes Practical <Scaling-up-Kubernetes.html>`_ |
+-----------------------------+----------+-------------------------------------------------------------------------------------------------------+
| 08 Oct 2020 | 150 min | `Overview <../../_static/pdf/resops2019/KubernetesPracticals.pdf>`_ |
| 08 Oct 2020 | 150 min | `Overview <../../_static/pdf/resops2020/KubernetesAdvancedPracticals.pdf>`_ |
| | | / `Advanced Kubernetes Reading <Important-considerations-for-research-pipelines.html>`_ |
+-----------------------------+----------+-------------------------------------------------------------------------------------------------------+
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment