summaryrefslogtreecommitdiff
path: root/vendor.conf
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2018-12-11 04:19:02 -0800
committerGitHub <noreply@github.com>2018-12-11 04:19:02 -0800
commite4e4fb741f874d788461acedb65e9a4e9dfe246c (patch)
tree47b3940dc4eaecca58260ce96bb397cd8f00c54f /vendor.conf
parent235a6300744636f650728f2a7545243aed045c91 (diff)
parent22b1f7f8cbef429713c422e40a7a70af253d9e49 (diff)
downloadpodman-e4e4fb741f874d788461acedb65e9a4e9dfe246c.tar.gz
podman-e4e4fb741f874d788461acedb65e9a4e9dfe246c.tar.bz2
podman-e4e4fb741f874d788461acedb65e9a4e9dfe246c.zip
Merge pull request #1857 from mtrmac/blob-info-caching
Vendor c/image + Buildah after merging blob-info-caching in both
Diffstat (limited to 'vendor.conf')
-rw-r--r--vendor.conf4
1 files changed, 2 insertions, 2 deletions
diff --git a/vendor.conf b/vendor.conf
index ac8a38355..75483e9f3 100644
--- a/vendor.conf
+++ b/vendor.conf
@@ -11,7 +11,7 @@ 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 63a1cbdc5e6537056695cf0d627c0a33b334df53
+github.com/containers/image d53afe179b381fafb427e6b9cf9b1996a98c1067
github.com/containers/storage db40f96d853dfced60c563e61fb66ba231ce7c8d
github.com/containers/psgo 5dde6da0bc8831b35243a847625bcf18183bd1ee
github.com/coreos/go-systemd v14
@@ -92,7 +92,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 9c65e5699cfa486531b3f123d9ce74873f0e18aa
+github.com/containers/buildah dd0f4f1b1eb49b841179049ac498e4b0f874b462
github.com/Nvveen/Gotty master
github.com/fsouza/go-dockerclient master
github.com/openshift/imagebuilder master