Merge branch 'master' into dev-1.15

This commit is contained in:
Barnabas Makonda
2019-06-19 23:19:27 +03:00
committed by GitHub
33 changed files with 458 additions and 302 deletions
@@ -183,7 +183,7 @@ add-apt-repository ppa:projectatomic/ppa
apt-get update
# Install CRI-O
apt-get install cri-o-1.11
apt-get install cri-o-1.13
{{< /tab >}}
{{< tab name="CentOS/RHEL 7.4+" codelang="bash" >}}