summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-01-13 20:51:38 +0100
committerGitHub <noreply@github.com>2020-01-13 20:51:38 +0100
commitc1d93666d4b175be29a0ba229ee0b94d50765888 (patch)
tree64a7973fe32769f0753a1ee56c60e213df342986 /contrib
parente83a1b87da0c2b88ebd69828a79d4b9ecf11b0dc (diff)
parent6e2ed9ad2efb16062b4d7984db91a239cd102ed9 (diff)
downloadpodman-c1d93666d4b175be29a0ba229ee0b94d50765888.tar.gz
podman-c1d93666d4b175be29a0ba229ee0b94d50765888.tar.bz2
podman-c1d93666d4b175be29a0ba229ee0b94d50765888.zip
Merge pull request #4853 from mheon/do_not_configure_with_slirp
Do not configure CNI when slirp4netns is requested
Diffstat (limited to 'contrib')
0 files changed, 0 insertions, 0 deletions