X Tutup
Skip to content

Commit 342ce3e

Browse files
estespestesp
authored
Merge pull request containerd#3789 from AkihiroSuda/vendor-20191030
bring back aufs and zfs
2 parents 4a1a1bc + a2688b9 commit 342ce3e

File tree

16 files changed

+2517
-9
lines changed

16 files changed

+2517
-9
lines changed

‎cmd/containerd/builtins_linux.go‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,12 @@
1717
package main
1818

1919
import (
20-
// TODO: Needs updated snapshotter interface
21-
//_ "github.com/containerd/aufs"
20+
_ "github.com/containerd/aufs"
2221
_ "github.com/containerd/containerd/metrics/cgroups"
2322
_ "github.com/containerd/containerd/runtime/v1/linux"
2423
_ "github.com/containerd/containerd/runtime/v2"
2524
_ "github.com/containerd/containerd/runtime/v2/runc/options"
2625
_ "github.com/containerd/containerd/snapshots/native"
2726
_ "github.com/containerd/containerd/snapshots/overlay"
28-
// TODO: Needs updated snapshotter interface
29-
//_ "github.com/containerd/zfs"
27+
_ "github.com/containerd/zfs"
3028
)

‎vendor.conf‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -83,9 +83,9 @@ k8s.io/kubernetes v1.16.0-rc.2
8383
k8s.io/utils c2654d5206da6b7b6ace12841e8f359bb89b443c
8484
sigs.k8s.io/yaml v1.1.0
8585

86-
# zfs dependencies (temporarily removed)
87-
# github.com/containerd/zfs 2ceb2dbb8154202ed1b8fd32e4ea25b491d7b251
88-
# github.com/mistifyio/go-zfs f784269be439d704d3dfa1906f45dd848fed2beb
86+
# zfs dependencies
87+
github.com/containerd/zfs 9abf673ca6ff9ab8d9bd776a4ceff8f6dc699c3d
88+
github.com/mistifyio/go-zfs f784269be439d704d3dfa1906f45dd848fed2beb
8989

90-
# aufs dependencies (temporarily removed)
91-
# github.com/containerd/aufs f894a800659b6e11c1a13084abd1712f346e349c
90+
# aufs dependencies
91+
github.com/containerd/aufs 371312c1e31c210a21e49bf3dfd3f31729ed9f2f

‎vendor/github.com/containerd/aufs/LICENSE‎

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

‎vendor/github.com/containerd/aufs/README.md‎

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

0 commit comments

Comments
 (0)
X Tutup