summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2019-05-28 21:07:43 +0200
committerGitHub <noreply@github.com>2019-05-28 21:07:43 +0200
commit8649dbdc11bc14feb59794d76ba197771d8a6d51 (patch)
tree30a70d58b5c2e967565d95712ce586fcfe1208a2 /contrib
parentbc7afd6d71da4173e4894ff352667a25987fa2ea (diff)
parentf2c8391ecc1d95ee192ca93bd69fc589f667fcf9 (diff)
downloadpodman-8649dbdc11bc14feb59794d76ba197771d8a6d51.tar.gz
podman-8649dbdc11bc14feb59794d76ba197771d8a6d51.tar.bz2
podman-8649dbdc11bc14feb59794d76ba197771d8a6d51.zip
Merge pull request #3210 from haircommander/conmon-0.2.0
bump conmon to v0.2.0
Diffstat (limited to 'contrib')
-rw-r--r--contrib/spec/podman.spec.in2
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/spec/podman.spec.in b/contrib/spec/podman.spec.in
index 985dbbc74..a1c11a5a6 100644
--- a/contrib/spec/podman.spec.in
+++ b/contrib/spec/podman.spec.in
@@ -35,7 +35,7 @@
# People want conmon packaged with the copr rpm
%global import_path_conmon github.com/containers/conmon
%global git_conmon https://%{import_path_conmon}
-%global commit_conmon f02c053eb37010fc76d1e2966de7f2cb9f969ef2
+%global commit_conmon 59952292a3b07ac125575024ae21956efe0ecdfb
%global shortcommit_conmon %(c=%{commit_conmon}; echo ${c:0:7})
Name: podman