From 282e906b5c60cebbb75124c6506b3891f45abc46 Mon Sep 17 00:00:00 2001
From: Lantao Liu <lantaol@google.com>
Date: Fri, 15 Dec 2017 19:39:49 +0000
Subject: [PATCH] Update containerd to
 6c7abf7c76c1973d4fb4b0bad51691de84869a51.

Signed-off-by: Lantao Liu <lantaol@google.com>
---
 cluster/health-monitor.sh                                  | 2 +-
 hack/update-vendor.sh                                      | 2 +-
 hack/versions                                              | 2 +-
 vendor.conf                                                | 2 +-
 vendor/github.com/containerd/containerd/content/helpers.go | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/cluster/health-monitor.sh b/cluster/health-monitor.sh
index 775da294a..f0e1ce873 100755
--- a/cluster/health-monitor.sh
+++ b/cluster/health-monitor.sh
@@ -32,7 +32,7 @@ while true; do
   # cri-containerd to be working.
   if ! timeout ${COMMAND_TIMEOUT} ${CRICTL} sandboxes > /dev/null; then
     echo "crictl sandboxes timeout!"
-    pkill -9 containerd
+    pkill containerd
     pkill cri-containerd
     # Wait for a while, as we don't want to kill it again before it is really up.
     sleep ${SLEEP_SECONDS}
diff --git a/hack/update-vendor.sh b/hack/update-vendor.sh
index 44703594e..d9eccd4a5 100755
--- a/hack/update-vendor.sh
+++ b/hack/update-vendor.sh
@@ -41,7 +41,7 @@ do
       echo "Need to update the value of ${key} from ${version_commitid} to ${vendor_commitid}."
     else
       echo "Updating the value of ${key} from ${version_commitid} to ${vendor_commitid}."
-      sed -i "s/${version_commitid}/${vendor_commitid}/g" hack/versions
+      sed -i "s/\b${version_commitid}$/${vendor_commitid}/g" hack/versions
     fi
   fi
 done
diff --git a/hack/versions b/hack/versions
index 12ad4984f..17d345383 100644
--- a/hack/versions
+++ b/hack/versions
@@ -1,6 +1,6 @@
 RUNC_VERSION=74a17296470088de3805e138d3d87c62e613dfc4
 CNI_VERSION=v0.6.0
-CONTAINERD_VERSION=v1.0.0
+CONTAINERD_VERSION=6c7abf7c76c1973d4fb4b0bad51691de84869a51
 CONTAINERD_REPO=
 CRITOOL_VERSION=v1.0.0-alpha.0
 KUBERNETES_VERSION=164317879bcd810b97e5ebf1c8df041770f2ff1b
diff --git a/vendor.conf b/vendor.conf
index 046c10ac3..ede4caec6 100644
--- a/vendor.conf
+++ b/vendor.conf
@@ -1,7 +1,7 @@
 github.com/blang/semver v3.1.0
 github.com/BurntSushi/toml a368813c5e648fee92e5f6c30e3944ff9d5e8895
 github.com/containerd/cgroups 29da22c6171a4316169f9205ab6c49f59b5b852f
-github.com/containerd/containerd v1.0.0
+github.com/containerd/containerd 6c7abf7c76c1973d4fb4b0bad51691de84869a51
 github.com/containerd/continuity cf279e6ac893682272b4479d4c67fd3abf878b4e
 github.com/containerd/fifo fbfb6a11ec671efbe94ad1c12c2e98773f19e1e6
 github.com/containerd/typeurl f6943554a7e7e88b3c14aad190bf05932da84788
diff --git a/vendor/github.com/containerd/containerd/content/helpers.go b/vendor/github.com/containerd/containerd/content/helpers.go
index 86b853685..83c31d917 100644
--- a/vendor/github.com/containerd/containerd/content/helpers.go
+++ b/vendor/github.com/containerd/containerd/content/helpers.go
@@ -77,7 +77,7 @@ func Copy(ctx context.Context, cw Writer, r io.Reader, size int64, expected dige
 		r, err = seekReader(r, ws.Offset, size)
 		if err != nil {
 			if !isUnseekable(err) {
-				return errors.Wrapf(err, "unabled to resume write to %v", ws.Ref)
+				return errors.Wrapf(err, "unable to resume write to %v", ws.Ref)
 			}
 
 			// reader is unseekable, try to move the writer back to the start.