Merge pull request #417 from tonistiigi/update-containerd

vendor: update containerd to 7f800e0a
moby · May 29, 2018 · cca48c0 · cca48c0
2 parents 8b131af + ff501ac
commit cca48c0
Show file tree

Hide file tree

Showing 47 changed files with 623 additions and 1,018 deletions.
diff --git a/vendor.conf b/vendor.conf
@@ -6,7 +6,7 @@ github.com/davecgh/go-spew v1.1.0
 github.com/pmezard/go-difflib v1.0.0
 golang.org/x/sys 314a259e304ff91bd6985da2a7149bbf91237993
 
-github.com/containerd/containerd a15e7a0be093db114409d377dcee75c4ddce5e34
+github.com/containerd/containerd 7f800e0a7bb1e2547baca4d5bbf317ceeb341c14
 github.com/containerd/typeurl f6943554a7e7e88b3c14aad190bf05932da84788
 golang.org/x/sync 450f422ab23cf9881c94e2db30cac0eb1b7cf80c
 github.com/sirupsen/logrus v1.0.0
@@ -16,7 +16,7 @@ golang.org/x/net 0ed95abb35c445290478a5348a7b38bb154135fd
 github.com/gogo/protobuf v1.0.0
 github.com/gogo/googleapis 08a7655d27152912db7aaf4f983275eaf8d128ef
 github.com/golang/protobuf 1643683e1b54a9e88ad26d98f81400c8c9d9f4f9
-github.com/containerd/continuity 3e8f2ea4b190484acb976a5b378d373429639a1a
+github.com/containerd/continuity d3c23511c1bf5851696cba83143d9cbcd666869b
 github.com/opencontainers/image-spec v1.0.1
 github.com/opencontainers/runc 69663f0bd4b60df09991c08812a60108003fa340
 github.com/Microsoft/go-winio v0.4.5

diff --git a/vendor/github.com/containerd/containerd/README.md b/vendor/github.com/containerd/containerd/README.md
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/container.go b/vendor/github.com/containerd/containerd/container.go
diff --git a/vendor/github.com/containerd/containerd/container_opts.go b/vendor/github.com/containerd/containerd/container_opts.go
diff --git a/...m/containerd/containerd/content_reader.go → ...ontainerd/content/proxy/content_reader.go b/...m/containerd/containerd/content_reader.go → ...ontainerd/content/proxy/content_reader.go
diff --git a/...om/containerd/containerd/content_store.go → ...containerd/content/proxy/content_store.go b/...om/containerd/containerd/content_store.go → ...containerd/content/proxy/content_store.go
diff --git a/...m/containerd/containerd/content_writer.go → ...ontainerd/content/proxy/content_writer.go b/...m/containerd/containerd/content_writer.go → ...ontainerd/content/proxy/content_writer.go
diff --git a/vendor/github.com/containerd/containerd/metadata/buckets.go b/vendor/github.com/containerd/containerd/metadata/buckets.go
diff --git a/vendor/github.com/containerd/containerd/oci/spec.go b/vendor/github.com/containerd/containerd/oci/spec.go