From 48b7d8dacd2a9444ec6406227f3faaed7435989b Mon Sep 17 00:00:00 2001
From: Lantao Liu <lantaol@google.com>
Date: Thu, 17 May 2018 19:07:49 -0700
Subject: [PATCH] Update containerd to
 01a0741488487779a95035cd85504589034d2e91.

Signed-off-by: Lantao Liu <lantaol@google.com>
---
 vendor.conf                                   |  2 +-
 .../containerd/containerd/client.go           |  2 +-
 .../cmd/ctr/commands/events/events.go         | 46 +++++++++----------
 .../containerd/cmd/ctr/commands/tasks/list.go |  2 +-
 .../containerd/containerd/vendor.conf         |  2 +-
 .../containerd/containerd/version/version.go  |  2 +-
 6 files changed, 27 insertions(+), 29 deletions(-)

diff --git a/vendor.conf b/vendor.conf
index 0e9fdc8d9..437f2a3b3 100644
--- a/vendor.conf
+++ b/vendor.conf
@@ -4,7 +4,7 @@ github.com/boltdb/bolt e9cf4fae01b5a8ff89d0ec6b32f0d9c9f79aefdd
 github.com/BurntSushi/toml a368813c5e648fee92e5f6c30e3944ff9d5e8895
 github.com/containerd/cgroups fe281dd265766145e943a034aa41086474ea6130
 github.com/containerd/console cb7008ab3d8359b78c5f464cb7cf160107ad5925
-github.com/containerd/containerd 1381f8fddc4f826e12b48d46c9def347d5aa338a
+github.com/containerd/containerd 01a0741488487779a95035cd85504589034d2e91
 github.com/containerd/continuity 3e8f2ea4b190484acb976a5b378d373429639a1a
 github.com/containerd/fifo 3d5202aec260678c48179c56f40e6f38a095738c
 github.com/containerd/go-cni f2d7272f12d045b16ed924f50e91f9f9cecc55a7
diff --git a/vendor/github.com/containerd/containerd/client.go b/vendor/github.com/containerd/containerd/client.go
index c8e0b4a6b..132265e6f 100644
--- a/vendor/github.com/containerd/containerd/client.go
+++ b/vendor/github.com/containerd/containerd/client.go
@@ -367,7 +367,7 @@ func (c *Client) Pull(ctx context.Context, ref string, opts ...RemoteOpt) (Image
 	}
 	if pullCtx.Unpack {
 		if err := img.Unpack(ctx, pullCtx.Snapshotter); err != nil {
-			errors.Wrapf(err, "failed to unpack image on snapshotter %s", pullCtx.Snapshotter)
+			return nil, errors.Wrapf(err, "failed to unpack image on snapshotter %s", pullCtx.Snapshotter)
 		}
 	}
 	return img, nil
diff --git a/vendor/github.com/containerd/containerd/cmd/ctr/commands/events/events.go b/vendor/github.com/containerd/containerd/cmd/ctr/commands/events/events.go
index 083ee041f..507de4459 100644
--- a/vendor/github.com/containerd/containerd/cmd/ctr/commands/events/events.go
+++ b/vendor/github.com/containerd/containerd/cmd/ctr/commands/events/events.go
@@ -42,38 +42,36 @@ var Command = cli.Command{
 		defer cancel()
 		eventsClient := client.EventService()
 		eventsCh, errCh := eventsClient.Subscribe(ctx, context.Args()...)
-		for {
+		open := true
+		for open {
 			var e *events.Envelope
 			select {
-			case evt, closed := <-eventsCh:
-				if closed {
-					return nil
-				}
-				e = evt
-			case err := <-errCh:
+			case e = <-eventsCh:
+			case err, open = <-errCh:
 				return err
 			}
-
-			var out []byte
-			if e.Event != nil {
-				v, err := typeurl.UnmarshalAny(e.Event)
-				if err != nil {
-					return err
+			if e != nil {
+				var out []byte
+				if e.Event != nil {
+					v, err := typeurl.UnmarshalAny(e.Event)
+					if err != nil {
+						return err
+					}
+					out, err = json.Marshal(v)
+					if err != nil {
+						return err
+					}
 				}
-				out, err = json.Marshal(v)
-				if err != nil {
+				if _, err := fmt.Println(
+					e.Timestamp,
+					e.Namespace,
+					e.Topic,
+					string(out),
+				); err != nil {
 					return err
 				}
 			}
-
-			if _, err := fmt.Println(
-				e.Timestamp,
-				e.Namespace,
-				e.Topic,
-				string(out),
-			); err != nil {
-				return err
-			}
 		}
+		return nil
 	},
 }
diff --git a/vendor/github.com/containerd/containerd/cmd/ctr/commands/tasks/list.go b/vendor/github.com/containerd/containerd/cmd/ctr/commands/tasks/list.go
index 80732b216..edffbb13d 100644
--- a/vendor/github.com/containerd/containerd/cmd/ctr/commands/tasks/list.go
+++ b/vendor/github.com/containerd/containerd/cmd/ctr/commands/tasks/list.go
@@ -34,7 +34,7 @@ var listCommand = cli.Command{
 	Flags: []cli.Flag{
 		cli.BoolFlag{
 			Name:  "quiet, q",
-			Usage: "print only the task id & pid",
+			Usage: "print only the task id",
 		},
 	},
 	Action: func(context *cli.Context) error {
diff --git a/vendor/github.com/containerd/containerd/vendor.conf b/vendor/github.com/containerd/containerd/vendor.conf
index c4eb0cfb7..708b467ea 100644
--- a/vendor/github.com/containerd/containerd/vendor.conf
+++ b/vendor/github.com/containerd/containerd/vendor.conf
@@ -44,7 +44,7 @@ github.com/gotestyourself/gotestyourself 44dbf532bbf5767611f6f2a61bded572e337010
 github.com/google/go-cmp v0.1.0
 
 # cri dependencies
-github.com/containerd/cri v1.0.0-rc.2
+github.com/containerd/cri v1.0.0
 github.com/containerd/go-cni f2d7272f12d045b16ed924f50e91f9f9cecc55a7
 github.com/blang/semver v3.1.0
 github.com/containernetworking/cni v0.6.0
diff --git a/vendor/github.com/containerd/containerd/version/version.go b/vendor/github.com/containerd/containerd/version/version.go
index e1b5f54e0..051919a68 100644
--- a/vendor/github.com/containerd/containerd/version/version.go
+++ b/vendor/github.com/containerd/containerd/version/version.go
@@ -21,7 +21,7 @@ var (
 	Package = "github.com/containerd/containerd"
 
 	// Version holds the complete version number. Filled in at linking time.
-	Version = "1.1.0-rc.2+unknown"
+	Version = "1.1.0+unknown"
 
 	// Revision is filled with the VCS (e.g. git) revision being used to build
 	// the program at linking time.