diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-07-22 21:43:59 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-22 21:43:59 +0200 |
| commit | cf9efa90e5dcf89e10408eae5229c4ce904d9fc7 (patch) | |
| tree | 50acf3cc5fc809c135df6d7a3a1e1fbd887f26c1 /contrib | |
| parent | 69f74f13b0d041c45bc0e0c77c6c4ee3cd4cbdd4 (diff) | |
| parent | 0671dca90de97be983f13a0a5e714f825013eae4 (diff) | |
| download | podman-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 'contrib')
| -rw-r--r-- | contrib/spec/podman.spec.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/spec/podman.spec.in b/contrib/spec/podman.spec.in index ce5901f69..9d8467783 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 3e47d8dd45cdd973dbe256292d5e9c0bff195e56 +%global commit_conmon 6f3572558b97bc60dd8f8c7f0807748e6ce2c440 %global shortcommit_conmon %(c=%{commit_conmon}; echo ${c:0:7}) Name: podman |