From 614d47c560cb2706d708641740c425f955be86c4 Mon Sep 17 00:00:00 2001
From: CaoShuFeng <caosf.fnst@cn.fujitsu.com>
Date: Sun, 4 Mar 2018 03:38:53 +0800
Subject: [PATCH] fix description about kubeadm (#7594)

s/compatability/compatibility/
---
 docs/setup/independent/install-kubeadm.md | 32 +++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/docs/setup/independent/install-kubeadm.md b/docs/setup/independent/install-kubeadm.md
index a44ed9330e..2e4c829e64 100644
--- a/docs/setup/independent/install-kubeadm.md
+++ b/docs/setup/independent/install-kubeadm.md
@@ -139,6 +139,38 @@ systemctl enable docker && systemctl start docker
 
 {% endcapture %}
 
+<<<<<<< HEAD
+||||||| merged common ancestors
+**Note**: Make sure that the cgroup driver used by kubelet is the same as the one used by 
+Docker. To ensure compatability you can either update Docker, like so:
+
+```bash
+cat << EOF > /etc/docker/daemon.json
+{
+  "exec-opts": ["native.cgroupdriver=systemd"]
+}
+EOF
+```
+
+and restart Docker. Or ensure the `--cgroup-driver` kubelet flag is set to the same value 
+as Docker (e.g. `cgroupfs`).
+
+=======
+**Note**: Make sure that the cgroup driver used by kubelet is the same as the one used by 
+Docker. To ensure compatibility you can either update Docker, like so:
+
+```bash
+cat << EOF > /etc/docker/daemon.json
+{
+  "exec-opts": ["native.cgroupdriver=systemd"]
+}
+EOF
+```
+
+and restart Docker. Or ensure the `--cgroup-driver` kubelet flag is set to the same value 
+as Docker (e.g. `cgroupfs`).
+
+>>>>>>> fix description about kubeadm (#7594)
 {% assign tab_set_name = "docker_install" %}
 {% assign tab_names = "Ubuntu, Debian or HypriotOS;CentOS, RHEL or Fedora; Container Linux" | split: ';' | compact %}
 {% assign tab_contents = site.emptyArray | push: docker_ubuntu | push: docker_centos | push: docker_coreos %}