Upgrade conmon version for podman (#6622)

kubernetes · Feb 13, 2020 · 40bae89 · 40bae89
1 parent e87e2f1
commit 40bae89
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/deploy/iso/minikube-iso/package/conmon-master/conmon-master.hash b/deploy/iso/minikube-iso/package/conmon-master/conmon-master.hash
@@ -2,3 +2,4 @@
 sha256 4f978a59c6ee516f7e3febfb3b0360a17d1be2c283313e1aeb27adcb8c8f9166 dde3ccf93f01ce5a3e0f7a2c97053697cc3ed152.tar.gz
 sha256 75fad6e66b43c5039719edbd82ba072723aea6a9d4d8be4e7ac1c245a291ab1b 8455ce1ef385120deb827d0f0588c04357bad4c4.tar.gz
 sha256 6c9bf278ae6e125a39f1ae419e5bd314162a743f6587d70b1b6be095ac32b9af eb5fa88c26fde5ce1e3f8a1d2a8a9498b2d7dbe6.tar.gz
+sha256 93f7c127cb536fc60f4c08291fd34e99e492fdc6a36e6b0ddad97d868ecf10f7 29c336700f2999acf9db07662b4a61355076e64a.tar.gz
diff --git a/deploy/iso/minikube-iso/package/conmon-master/conmon-master.mk b/deploy/iso/minikube-iso/package/conmon-master/conmon-master.mk
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-# HEAD as of 2019-11-11
-CONMON_MASTER_VERSION = eb5fa88c26fde5ce1e3f8a1d2a8a9498b2d7dbe6
+# HEAD as of 2019-12-11, v2.0.6
+CONMON_MASTER_VERSION = 29c336700f2999acf9db07662b4a61355076e64a
 CONMON_MASTER_SITE = https://github.com/containers/conmon/archive
 CONMON_MASTER_SOURCE = $(CONMON_MASTER_VERSION).tar.gz
 CONMON_MASTER_LICENSE = Apache-2.0