summaryrefslogtreecommitdiff
path: root/libpod
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2019-05-17 21:49:10 +0200
committerGitHub <noreply@github.com>2019-05-17 21:49:10 +0200
commit00ecbfc1315a62940202574fb45f2ae2f4c48b63 (patch)
tree6a4c8c755c75d3ee215419dc21b8967f41c97be4 /libpod
parentba612a098c65f11730e8436cdebe86d3b979ddf4 (diff)
parentcb0d89c56e5a6515a2f79e041a0f7e3937ab087d (diff)
downloadpodman-00ecbfc1315a62940202574fb45f2ae2f4c48b63.tar.gz
podman-00ecbfc1315a62940202574fb45f2ae2f4c48b63.tar.bz2
podman-00ecbfc1315a62940202574fb45f2ae2f4c48b63.zip
Merge pull request #2844 from haircommander/cri-o-update
move to cri-o/cri-o and build with containers/conmon
Diffstat (limited to 'libpod')
0 files changed, 0 insertions, 0 deletions