diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-03-13 07:09:59 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-13 07:09:59 -0700 |
| commit | 8b3f759800ebd6e53e0a807728ede633aa9bdb36 (patch) | |
| tree | 5c3b81d5aa9b76139184f91f36150469c2214876 /vendor.conf | |
| parent | 8b637bd78c8c120d07f245d9a837e52afd47c72a (diff) | |
| parent | adad93342c9cfd8e6d5f6c591d44754c91be9e5c (diff) | |
| download | podman-8b3f759800ebd6e53e0a807728ede633aa9bdb36.tar.gz podman-8b3f759800ebd6e53e0a807728ede633aa9bdb36.tar.bz2 podman-8b3f759800ebd6e53e0a807728ede633aa9bdb36.zip | |
Merge pull request #2625 from rhatdan/vendor
Update vendor of Buildah and imagebuilder
Diffstat (limited to 'vendor.conf')
| -rw-r--r-- | vendor.conf | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vendor.conf b/vendor.conf index 08590bfe9..23a6e4c05 100644 --- a/vendor.conf +++ b/vendor.conf @@ -93,13 +93,13 @@ k8s.io/apimachinery kubernetes-1.10.13-beta.0 https://github.com/kubernetes/apim k8s.io/client-go kubernetes-1.10.13-beta.0 https://github.com/kubernetes/client-go github.com/mrunalp/fileutils 7d4729fb36185a7c1719923406c9d40e54fb93c7 github.com/varlink/go 3ac79db6fd6aec70924193b090962f92985fe199 -github.com/containers/buildah 345ffc2b29b4255a83cfa763db88799d8ec9c569 https://github.com/QiWang19/buildah +github.com/containers/buildah 3ba8822d309128f7d76599432b8d9cdf77d4032f # TODO: Gotty has not been updated since 2012. Can we find replacement? github.com/Nvveen/Gotty cd527374f1e5bff4938207604a14f2e38a9cf512 # do not go beyond the below commit as the next one requires a more recent # docker which is in conflict with openshift/imagebuilder github.com/fsouza/go-dockerclient 29c1814d12c072344bb91aac5d2ff719db39c523 -github.com/openshift/imagebuilder 36823496a6868f72bc36282cc475eb8a070c0934 +github.com/openshift/imagebuilder 705fe9255c57f8505efb9723a9ac4082b67973bc github.com/ulikunitz/xz v0.5.5 github.com/coreos/go-iptables v0.4.0 github.com/google/shlex c34317bd91bf98fab745d77b03933cf8769299fe |