Skip to content

Commit edf6484

Browse files
dmcgowandmcgowan
authored
Merge pull request #5243 from AkihiroSuda/update-zfs-20210322
go.mod: github.com/containerd/zfs v0.0.0-20210322090317-0e92c2247fb7 (for snapshot usage)
2 parents 4e919ff + 8cdc1f1 commit edf6484

5 files changed

Lines changed: 45 additions & 7 deletions

File tree

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ require (
1818
github.com/containerd/nri v0.0.0-20210316161719-dbaa18c31c14
1919
github.com/containerd/ttrpc v1.0.2
2020
github.com/containerd/typeurl v1.0.1
21-
github.com/containerd/zfs v0.0.0-20210315114300-dde8f0fda960
21+
github.com/containerd/zfs v0.0.0-20210322090317-0e92c2247fb7
2222
github.com/containernetworking/plugins v0.8.6
2323
github.com/coreos/go-systemd/v22 v22.1.0
2424
github.com/davecgh/go-spew v1.1.1

‎go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -158,8 +158,8 @@ github.com/containerd/typeurl v1.0.1 h1:PvuK4E3D5S5q6IqsPDCy928FhP0LUIGcmZ/Yhgp5
158158
github.com/containerd/typeurl v1.0.1/go.mod h1:TB1hUtrpaiO88KEK56ijojHS1+NeF0izUACaJW2mdXg=
159159
github.com/containerd/zfs v0.0.0-20200918131355-0a33824f23a2/go.mod h1:8IgZOBdv8fAgXddBT4dBXJPtxyRsejFIpXoklgxgEjw=
160160
github.com/containerd/zfs v0.0.0-20210301145711-11e8f1707f62/go.mod h1:A9zfAbMlQwE+/is6hi0Xw8ktpL+6glmqZYtevJgaB8Y=
161-
github.com/containerd/zfs v0.0.0-20210315114300-dde8f0fda960 h1:HXgv62Qod4KvnxeNWszVQ4ZR+NrVY9ODFxlaqKzDQMs=
162-
github.com/containerd/zfs v0.0.0-20210315114300-dde8f0fda960/go.mod h1:m+m51S1DvAP6r3FcmYCp54bQ34pyOwTieQDNRIRHsFY=
161+
github.com/containerd/zfs v0.0.0-20210322090317-0e92c2247fb7 h1:8vskJ2uVsiu9pjODDUnyj6gKZ6mNPMlqPgfqV6gnuRc=
162+
github.com/containerd/zfs v0.0.0-20210322090317-0e92c2247fb7/go.mod h1:m+m51S1DvAP6r3FcmYCp54bQ34pyOwTieQDNRIRHsFY=
163163
github.com/containernetworking/cni v0.7.1/go.mod h1:LGwApLUm2FpoOfxTDEeq8T9ipbpZ61X79hmU3w8FmsY=
164164
github.com/containernetworking/cni v0.8.0 h1:BT9lpgGoH4jw3lFC7Odz2prU5ruiYKcgAjMCbgybcKI=
165165
github.com/containernetworking/cni v0.8.0/go.mod h1:LGwApLUm2FpoOfxTDEeq8T9ipbpZ61X79hmU3w8FmsY=

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

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

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

Lines changed: 41 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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ github.com/containerd/ttrpc/plugin
105105
# github.com/containerd/typeurl v1.0.1
106106
## explicit
107107
github.com/containerd/typeurl
108-
# github.com/containerd/zfs v0.0.0-20210315114300-dde8f0fda960
108+
# github.com/containerd/zfs v0.0.0-20210322090317-0e92c2247fb7
109109
## explicit
110110
github.com/containerd/zfs
111111
github.com/containerd/zfs/plugin

0 commit comments

Comments
 (0)