Update containerd to 6bff39c643886dfa3d546e83a90a5

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
imdone · Nov 30, 2017 · c2cb302 · c2cb302
1 parent aa3ce07
commit c2cb302
Show file tree

Hide file tree

Showing 21 changed files with 641 additions and 334 deletions.
diff --git a/hack/dockerfile/binaries-commits b/hack/dockerfile/binaries-commits
@@ -4,7 +4,7 @@ TOMLV_COMMIT=9baf8a8a9f2ed20a8e54160840c492f937eeaf9a
 
 # When updating RUNC_COMMIT, also update runc in vendor.conf accordingly
 RUNC_COMMIT=b2567b37d7b75eb4cf325b77297b140ea686ce8f
-CONTAINERD_COMMIT=59bd1967112885c4d49e510e5570182865ba6fdd
+CONTAINERD_COMMIT=6bff39c643886dfa3d546e83a90a527b64ddeacf
 TINI_COMMIT=949e6facb77383876aeff8a6944dde66b3089574
 LIBNETWORK_COMMIT=7b2b1feb1de4817d522cc372af149ff48d25028e
 VNDR_COMMIT=a6e196d8b4b0cbbdc29aebdb20c59ac6926bb384

diff --git a/vendor.conf b/vendor.conf
@@ -103,15 +103,15 @@ github.com/googleapis/gax-go da06d194a00e19ce00d9011a13931c3f6f6887c7
 google.golang.org/genproto d80a6e20e776b0b17a324d0ba1ab50a39c8e8944
 
 # containerd
-github.com/containerd/containerd 59bd1967112885c4d49e510e5570182865ba6fdd
+github.com/containerd/containerd 6bff39c643886dfa3d546e83a90a527b64ddeacf
 github.com/containerd/fifo fbfb6a11ec671efbe94ad1c12c2e98773f19e1e6
 github.com/containerd/continuity 35d55c5e8dd23b32037d56cf97174aff3efdfa83
-github.com/containerd/cgroups f7dd103d3e4e696aa67152f6b4ddd1779a3455a9
+github.com/containerd/cgroups 29da22c6171a4316169f9205ab6c49f59b5b852f
 github.com/containerd/console 84eeaae905fa414d03e07bcd6c8d3f19e7cf180e
 github.com/containerd/go-runc ed1cbe1fc31f5fb2359d3a54b6330d1a097858b7
 github.com/containerd/typeurl f6943554a7e7e88b3c14aad190bf05932da84788
 github.com/dmcgowan/go-tar go1.10
-github.com/stevvooe/ttrpc bdb2ab7a8169e485e39421e666e15a505e575fd2
+github.com/stevvooe/ttrpc 8c92e22ce0c492875ccaac3ab06143a77d8ed0c1
 
 # cluster
 github.com/docker/swarmkit de950a7ed842c7b7e47e9451cde9bf8f96031894

diff --git a/vendor/github.com/containerd/cgroups/cgroup.go b/vendor/github.com/containerd/cgroups/cgroup.go
diff --git a/.../api/services/snapshot/v1/snapshots.pb.go → ...api/services/snapshots/v1/snapshots.pb.go b/.../api/services/snapshot/v1/snapshots.pb.go → ...api/services/snapshots/v1/snapshots.pb.go
diff --git a/.../api/services/snapshot/v1/snapshots.proto → ...api/services/snapshots/v1/snapshots.proto b/.../api/services/snapshot/v1/snapshots.proto → ...api/services/snapshots/v1/snapshots.proto
diff --git a/vendor/github.com/containerd/containerd/client.go b/vendor/github.com/containerd/containerd/client.go
diff --git a/vendor/github.com/containerd/containerd/image.go b/vendor/github.com/containerd/containerd/image.go
diff --git a/vendor/github.com/containerd/containerd/metadata/db.go b/vendor/github.com/containerd/containerd/metadata/db.go