summaryrefslogtreecommitdiff
path: root/.cirrus.yml
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2019-07-22 21:43:59 +0200
committerGitHub <noreply@github.com>2019-07-22 21:43:59 +0200
commitcf9efa90e5dcf89e10408eae5229c4ce904d9fc7 (patch)
tree50acf3cc5fc809c135df6d7a3a1e1fbd887f26c1 /.cirrus.yml
parent69f74f13b0d041c45bc0e0c77c6c4ee3cd4cbdd4 (diff)
parent0671dca90de97be983f13a0a5e714f825013eae4 (diff)
downloadpodman-cf9efa90e5dcf89e10408eae5229c4ce904d9fc7.tar.gz
podman-cf9efa90e5dcf89e10408eae5229c4ce904d9fc7.tar.bz2
podman-cf9efa90e5dcf89e10408eae5229c4ce904d9fc7.zip
Merge pull request #3620 from haircommander/bump-conmon
use conmon v1.0.0-rc2
Diffstat (limited to '.cirrus.yml')
-rw-r--r--.cirrus.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/.cirrus.yml b/.cirrus.yml
index 578a3eef0..75b6fba8a 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -43,7 +43,7 @@ env:
# Git commits to use while building dependencies into cache-images
FEDORA_CNI_COMMIT: "412b6d31280682bb4fab4446f113c22ff1886554"
CNI_COMMIT: "7480240de9749f9a0a5c8614b17f1f03e0c06ab9"
- CONMON_COMMIT: "3e47d8dd45cdd973dbe256292d5e9c0bff195e56"
+ CONMON_COMMIT: "6f3572558b97bc60dd8f8c7f0807748e6ce2c440"
CRIU_COMMIT: "c74b83cd49c00589c0c0468ba5fe685b67fdbd0a"
# Special image w/ nested-libvirt + tools for creating new cache and base images
IMAGE_BUILDER_CACHE_IMAGE_NAME: "image-builder-image-1541772081"