summaryrefslogtreecommitdiff
path: root/vendor.conf
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2018-10-11 10:40:37 -0700
committerGitHub <noreply@github.com>2018-10-11 10:40:37 -0700
commit6983e00a2808b29481d1cb460aab2eea1db6ef73 (patch)
tree2ee6bc368cc698e13d5dd5249061ecd2e2f93f6e /vendor.conf
parent3c23bfca807eab55c145092c73dd8eb1e6599f38 (diff)
parent112e1402c9e2ee29a387cd84a973471c1888e4b9 (diff)
downloadpodman-6983e00a2808b29481d1cb460aab2eea1db6ef73.tar.gz
podman-6983e00a2808b29481d1cb460aab2eea1db6ef73.tar.bz2
podman-6983e00a2808b29481d1cb460aab2eea1db6ef73.zip
Merge pull request #1623 from mheon/static_ip
Add ability to specify static IPs with --ip flag
Diffstat (limited to 'vendor.conf')
-rw-r--r--vendor.conf2
1 files changed, 1 insertions, 1 deletions
diff --git a/vendor.conf b/vendor.conf
index d65014992..75b92e846 100644
--- a/vendor.conf
+++ b/vendor.conf
@@ -14,7 +14,7 @@ github.com/containers/image 918dbb93e6e099b196b498c38d079f6bb924d0c8
github.com/containers/storage 41294c85d97bef688e18f710402895dbecde3308
github.com/containers/psgo 5dde6da0bc8831b35243a847625bcf18183bd1ee
github.com/coreos/go-systemd v14
-github.com/cri-o/ocicni master
+github.com/cri-o/ocicni 2d2983e40c242322a56c22a903785e7f83eb378c
github.com/cyphar/filepath-securejoin v0.2.1
github.com/davecgh/go-spew v1.1.0
github.com/docker/distribution 7a8efe719e55bbfaff7bc5718cdf0ed51ca821df