Merged DockerSF & EU and fixed title

sudo-bmitch · Nov 21, 2018 · 8fac5f5 · 8fac5f5
1 parent 0d652c9
commit 8fac5f5
Show file tree

Hide file tree

Showing 22 changed files with 0 additions and 921 deletions.
diff --git a/DockerConBCN2018/logging/fields.png → DockerCon/logging/fields.png b/DockerConBCN2018/logging/fields.png → DockerCon/logging/fields.png
diff --git a/DockerConBCN2018/logging/getting-started.md → DockerCon/logging/getting-started.md b/DockerConBCN2018/logging/getting-started.md → DockerCon/logging/getting-started.md
diff --git a/DockerConBCN2018/logging/indexpattern.png → DockerCon/logging/indexpattern.png b/DockerConBCN2018/logging/indexpattern.png → DockerCon/logging/indexpattern.png
diff --git a/DockerConBCN2018/logging/kibananew.png → DockerCon/logging/kibananew.png b/DockerConBCN2018/logging/kibananew.png → DockerCon/logging/kibananew.png
diff --git a/DockerConBCN2018/logging/log-drivers.md → DockerCon/logging/log-drivers.md b/DockerConBCN2018/logging/log-drivers.md → DockerCon/logging/log-drivers.md
diff --git a/DockerConBCN2018/logging/setup.md → DockerCon/logging/setup.md b/DockerConBCN2018/logging/setup.md → DockerCon/logging/setup.md
diff --git a/DockerConBCN2018/logging/timestamp.png → DockerCon/logging/timestamp.png b/DockerConBCN2018/logging/timestamp.png → DockerCon/logging/timestamp.png
diff --git a/DockerConBCN2018/monitoring/cadvisor.md → DockerCon/monitoring/cadvisor.md b/DockerConBCN2018/monitoring/cadvisor.md → DockerCon/monitoring/cadvisor.md
diff --git a/...ConBCN2018/monitoring/monitoring-stack.md → DockerCon/monitoring/monitoring-stack.md b/...ConBCN2018/monitoring/monitoring-stack.md → DockerCon/monitoring/monitoring-stack.md
diff --git a/DockerConBCN2018/monitoring/stats.md → DockerCon/monitoring/stats.md b/DockerConBCN2018/monitoring/stats.md → DockerCon/monitoring/stats.md
diff --git a/DockerConBCN2018/readme.md → DockerCon/readme.md b/DockerConBCN2018/readme.md → DockerCon/readme.md
diff --git a/DockerConSF2018/logging/fields.png b/DockerConSF2018/logging/fields.png
diff --git a/DockerConSF2018/logging/getting-started.md b/DockerConSF2018/logging/getting-started.md
diff --git a/DockerConSF2018/logging/indexpattern.png b/DockerConSF2018/logging/indexpattern.png
diff --git a/DockerConSF2018/logging/kibananew.png b/DockerConSF2018/logging/kibananew.png