summaryrefslogtreecommitdiff
path: root/vendor.conf
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2018-09-29 08:43:26 -0700
committerGitHub <noreply@github.com>2018-09-29 08:43:26 -0700
commit1859e35c76107351da40532076f346dd40d2ab91 (patch)
tree728505724a33342ce299b01ce2c7c6b74aa847ee /vendor.conf
parent7b152a24be224ee454b3f698cc1c1ed71330a476 (diff)
parentf60fe5fb2f214d4131f4f6ea46f440dcdd4aafab (diff)
downloadpodman-1859e35c76107351da40532076f346dd40d2ab91.tar.gz
podman-1859e35c76107351da40532076f346dd40d2ab91.tar.bz2
podman-1859e35c76107351da40532076f346dd40d2ab91.zip
Merge pull request #1567 from rhatdan/vendor
Vendor in the latest containers/storage, image and buildah
Diffstat (limited to 'vendor.conf')
-rw-r--r--vendor.conf6
1 files changed, 3 insertions, 3 deletions
diff --git a/vendor.conf b/vendor.conf
index 1f28159cd..ccad28c0b 100644
--- a/vendor.conf
+++ b/vendor.conf
@@ -10,8 +10,8 @@ github.com/containerd/cgroups 58556f5ad8448d99a6f7bea69ea4bdb7747cfeb0
github.com/containerd/continuity master
github.com/containernetworking/cni v0.7.0-alpha1
github.com/containernetworking/plugins 1562a1e60ed101aacc5e08ed9dbeba8e9f3d4ec1
-github.com/containers/image 85d7559d44fd71f30e46e43d809bfbf88d11d916
-github.com/containers/storage 243c4cd616afdf06b4a975f18c4db083d26b1641
+github.com/containers/image 8f11f3ad8912d8bc43a7d25992b8f313ffefd430
+github.com/containers/storage 68332c059156eae970a03245cfcd4d717fb66ecd
github.com/containers/psgo 5dde6da0bc8831b35243a847625bcf18183bd1ee
github.com/coreos/go-systemd v14
github.com/cri-o/ocicni master
@@ -90,7 +90,7 @@ k8s.io/kube-openapi 275e2ce91dec4c05a4094a7b1daee5560b555ac9 https://github.com/
k8s.io/utils 258e2a2fa64568210fbd6267cf1d8fd87c3cb86e https://github.com/kubernetes/utils
github.com/mrunalp/fileutils master
github.com/varlink/go master
-github.com/containers/buildah 53b05ae20fdd801f33cad5e01789898dba31029d
+github.com/containers/buildah cf87f0947ef719872816cc5d6a5ba4db1c261365
github.com/Nvveen/Gotty master
github.com/fsouza/go-dockerclient master
github.com/openshift/imagebuilder master