Merge pull request google#1967 from jessfraz/vendor

vendor: update docker import
mannychang · Jun 14, 2018 · f834c0f · f834c0f
2 parents 198bf16 + d7df66e
commit f834c0f
Show file tree

Hide file tree

Showing 236 changed files with 3,814 additions and 7,560 deletions.
diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
diff --git a/fs/fs.go b/fs/fs.go
@@ -107,7 +107,7 @@ type CrioContext struct {
 }
 
 func NewFsInfo(context Context) (FsInfo, error) {
-	mounts, err := mount.GetMounts()
+	mounts, err := mount.GetMounts(nil)
 	if err != nil {
 		return nil, err
 	}