Skip to content

Commit 688c468

Browse files
AkihiroSudaAkihiroSuda
authored
Merge pull request #5380 from samuelkarp/snapshotters
2 parents 9efd3e2 + 6dd29c2 commit 688c468

5 files changed

Lines changed: 14 additions & 8 deletions

File tree

‎go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ go 1.16
55
require (
66
github.com/Microsoft/go-winio v0.4.17
77
github.com/Microsoft/hcsshim v0.8.16
8-
github.com/containerd/aufs v0.0.0-20210316121734-20793ff83c97
8+
github.com/containerd/aufs v0.0.0-20210416161429-fb0192dcb2c0
99
github.com/containerd/btrfs v0.0.0-20210316141732-918d888fb676
1010
github.com/containerd/cgroups v0.0.0-20210114181951-8a68de567b68
1111
github.com/containerd/console v1.0.2
@@ -17,7 +17,7 @@ require (
1717
github.com/containerd/nri v0.0.0-20210316161719-dbaa18c31c14
1818
github.com/containerd/ttrpc v1.0.2
1919
github.com/containerd/typeurl v1.0.2
20-
github.com/containerd/zfs v0.0.0-20210324211415-d5c4544f0433
20+
github.com/containerd/zfs v0.0.0-20210416085227-4140c9077d87
2121
github.com/containernetworking/plugins v0.9.1
2222
github.com/coreos/go-systemd/v22 v22.1.0
2323
github.com/davecgh/go-spew v1.1.1

‎go.sum‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,8 @@ github.com/containerd/aufs v0.0.0-20200908144142-dab0cbea06f4/go.mod h1:nukgQABA
9696
github.com/containerd/aufs v0.0.0-20201003224125-76a6863f2989/go.mod h1:AkGGQs9NM2vtYHaUen+NljV0/baGCAPELGm2q9ZXpWU=
9797
github.com/containerd/aufs v0.0.0-20210316121734-20793ff83c97 h1:eDnTE2gn5fNykNuQdUIhr5XHqLJR52FXCGxhWNHG4FM=
9898
github.com/containerd/aufs v0.0.0-20210316121734-20793ff83c97/go.mod h1:kL5kd6KM5TzQjR79jljyi4olc1Vrx6XBlcyj3gNv2PU=
99+
github.com/containerd/aufs v0.0.0-20210416161429-fb0192dcb2c0 h1:naOo1n+31DqP+0v8OJsrZg32CCLHUlhY6dfnnZBlgtU=
100+
github.com/containerd/aufs v0.0.0-20210416161429-fb0192dcb2c0/go.mod h1:kL5kd6KM5TzQjR79jljyi4olc1Vrx6XBlcyj3gNv2PU=
99101
github.com/containerd/btrfs v0.0.0-20201111183144-404b9149801e/go.mod h1:jg2QkJcsabfHugurUvvPhS3E08Oxiuh5W/g1ybB4e0E=
100102
github.com/containerd/btrfs v0.0.0-20210316141732-918d888fb676 h1:jNaRXAhCLuQ2x3k4nZNxaZN27/BCMhLfVkCEokYPI5Q=
101103
github.com/containerd/btrfs v0.0.0-20210316141732-918d888fb676/go.mod h1:zMcX3qkXTAi9GI50+0HOeuV8LU2ryCE/V2vG/ZBiTss=
@@ -169,6 +171,8 @@ github.com/containerd/zfs v0.0.0-20210301145711-11e8f1707f62/go.mod h1:A9zfAbMlQ
169171
github.com/containerd/zfs v0.0.0-20210315114300-dde8f0fda960/go.mod h1:m+m51S1DvAP6r3FcmYCp54bQ34pyOwTieQDNRIRHsFY=
170172
github.com/containerd/zfs v0.0.0-20210324211415-d5c4544f0433 h1:oFJf1mMvgJAt2QwgEsXLMQK/qRTY8JXwsCV7No1uCb8=
171173
github.com/containerd/zfs v0.0.0-20210324211415-d5c4544f0433/go.mod h1:m+m51S1DvAP6r3FcmYCp54bQ34pyOwTieQDNRIRHsFY=
174+
github.com/containerd/zfs v0.0.0-20210416085227-4140c9077d87 h1:04tsitu/xTkLWo80gnw+R8jhAEKjuuvt/NL7B1bMLWU=
175+
github.com/containerd/zfs v0.0.0-20210416085227-4140c9077d87/go.mod h1:m+m51S1DvAP6r3FcmYCp54bQ34pyOwTieQDNRIRHsFY=
172176
github.com/containernetworking/cni v0.7.1/go.mod h1:LGwApLUm2FpoOfxTDEeq8T9ipbpZ61X79hmU3w8FmsY=
173177
github.com/containernetworking/cni v0.8.0/go.mod h1:LGwApLUm2FpoOfxTDEeq8T9ipbpZ61X79hmU3w8FmsY=
174178
github.com/containernetworking/cni v0.8.1 h1:7zpDnQ3T3s4ucOuJ/ZCLrYBxzkg0AELFfII3Epo9TmI=

‎vendor/github.com/containerd/aufs/plugin/plugin.go‎

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

‎vendor/github.com/containerd/zfs/plugin/plugin.go‎

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

‎vendor/modules.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ github.com/cilium/ebpf/asm
5151
github.com/cilium/ebpf/internal
5252
github.com/cilium/ebpf/internal/btf
5353
github.com/cilium/ebpf/internal/unix
54-
# github.com/containerd/aufs v0.0.0-20210316121734-20793ff83c97
54+
# github.com/containerd/aufs v0.0.0-20210416161429-fb0192dcb2c0
5555
## explicit
5656
github.com/containerd/aufs
5757
github.com/containerd/aufs/plugin
@@ -103,7 +103,7 @@ github.com/containerd/ttrpc/plugin
103103
# github.com/containerd/typeurl v1.0.2
104104
## explicit
105105
github.com/containerd/typeurl
106-
# github.com/containerd/zfs v0.0.0-20210324211415-d5c4544f0433
106+
# github.com/containerd/zfs v0.0.0-20210416085227-4140c9077d87
107107
## explicit
108108
github.com/containerd/zfs
109109
github.com/containerd/zfs/plugin

0 commit comments

Comments
 (0)