Skip to content

Commit 8822cab

Browse files
Merge pull request #2729 from thaJeztah/bump_engine
Updater docker/docker to latest master, containerd v1.4.1
2 parents 75598aa + 33ecbbd commit 8822cab

File tree

4 files changed

+14
-11
lines changed

4 files changed

+14
-11
lines changed

vendor.conf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ github.com/Azure/go-ansiterm d6e3b3328b783f23731bc4d05887
44
github.com/beorn7/perks 37c8de3658fcb183f997c4e13e8337516ab753e6 # v1.0.1
55
github.com/cespare/xxhash/v2 d7df74196a9e781ede915320c11c378c1b2f3a1f # v2.1.1
66
github.com/containerd/console 8375c3424e4d7b114e8a90a4a40c8e1b40d1d4e6 # v1.0.0
7-
github.com/containerd/containerd e9f94064b9616ab36a8a51d632a63f97f7783c3d # v1.4.0-rc.1
7+
github.com/containerd/containerd c623d1b36f09f8ef6536a057bd658b3aa8632828 # v1.4.1
88
github.com/containerd/continuity efbc4488d8fe1bdc16bde3b2d2990d9b3a899165
99
github.com/containerd/cgroups 318312a373405e5e91134d8063d04d59768a1bff
1010
github.com/coreos/etcd d57e8b8d97adfc4a6c224fe116714bf1a1f3beb9 # v3.3.12
@@ -13,7 +13,7 @@ github.com/creack/pty 3a6a957789163cacdfe0e291617a
1313
github.com/davecgh/go-spew 8991bc29aa16c548c550c7ff78260e27b9ab7c73 # v1.1.1
1414
github.com/docker/compose-on-kubernetes 78e6a00beda64ac8ccb9fec787e601fe2ce0d5bb # v0.5.0-alpha1
1515
github.com/docker/distribution 0d3efadf0154c2b8a4e7b6621fff9809655cc580
16-
github.com/docker/docker f50a40e889fdaeebf14fce1d494f95e60092d21d
16+
github.com/docker/docker 7f7e4abb331a2973cfb3223710cc35a3e476b1b3
1717
github.com/docker/docker-credential-helpers 54f0238b6bf101fc3ad3b34114cb5520beb562f5 # v0.6.3
1818
github.com/docker/go d30aec9fd63c35133f8f79c3412ad91a3b08be06 # Contains a customized version of canonical/json and is used by Notary. The package is periodically rebased on current Go versions.
1919
github.com/docker/go-connections 7395e3f8aa162843a74ed6d48e79627d9792ac55 # v0.4.0

vendor/github.com/containerd/containerd/vendor.conf

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/docker/docker/pkg/system/stat_freebsd.go renamed to vendor/github.com/docker/docker/pkg/system/stat_bsd.go

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/docker/docker/vendor.conf

Lines changed: 7 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)