Vendor containers/storage v1.12.4

The CONTRIBUTING.md guidlines have been updated as well. (Modified by mitr@redhat.com to apply to vendor.conf, and to drop the CONTRIBUTING.md bit.) Signed-off-by: Sascha Grunert <sgrunert@suse.com>
cri-o · Jun 17, 2019 · 490fa24 · 490fa24
1 parent afe6f83
commit 490fa24
Show file tree

Hide file tree

Showing 14 changed files with 243 additions and 57 deletions.
diff --git a/test/mocks/containerstorage/containerstorage.go b/test/mocks/containerstorage/containerstorage.go
diff --git a/vendor.conf b/vendor.conf
@@ -20,7 +20,7 @@ github.com/containers/image v1.5.1
 github.com/mattn/go-isatty v0.0.4
 github.com/vbauerster/mpb v3.4.0
 github.com/ostreedev/ostree-go d0388bd827cfac6fa8eec760246eb8375674b2a0
-github.com/containers/storage v1.12.1
+github.com/containers/storage v1.12.4
 github.com/containernetworking/cni v0.7.0-rc2
 github.com/containernetworking/plugins v0.7.5
 google.golang.org/grpc 5b3c4e850e90a4cf6a20ebd46c8b32a0a3afcb9e https://github.com/grpc/grpc-go

diff --git a/vendor/github.com/containers/storage/containers_ffjson.go b/vendor/github.com/containers/storage/containers_ffjson.go
diff --git a/...m/containers/storage/drivers/copy/copy.go → ...ainers/storage/drivers/copy/copy_linux.go b/...m/containers/storage/drivers/copy/copy.go → ...ainers/storage/drivers/copy/copy_linux.go
diff --git a/vendor/github.com/containers/storage/drivers/copy/copy_unsupported.go b/vendor/github.com/containers/storage/drivers/copy/copy_unsupported.go
diff --git a/vendor/github.com/containers/storage/drivers/devmapper/device_setup.go b/vendor/github.com/containers/storage/drivers/devmapper/device_setup.go
diff --git a/vendor/github.com/containers/storage/drivers/overlay/overlay.go b/vendor/github.com/containers/storage/drivers/overlay/overlay.go
diff --git a/vendor/github.com/containers/storage/images_ffjson.go b/vendor/github.com/containers/storage/images_ffjson.go
diff --git a/vendor/github.com/containers/storage/lockfile.go b/vendor/github.com/containers/storage/lockfile.go
diff --git a/vendor/github.com/containers/storage/lockfile_unix.go b/vendor/github.com/containers/storage/lockfile_unix.go