Merge remote-tracking branch 'origin/master' into jenkins-build-15

OP#785 switch MemoryLimit to MemoryMax
Recommit for updates in build 14
2026-09-22 14:32:02 +02:00 · 2026-09-22 14:30:56 +02:00 · 2026-09-22 14:10:46 +02:00
1 changed files with 1 additions and 1 deletions
--- a/templates/clamd_svc.erb
+++ b/templates/clamd_svc.erb
@@ -14,7 +14,7 @@ ExecStart = /usr/sbin/clamd -c /etc/clamd.d/%i.conf
 ExecReload=/bin/kill -USR2 $MAINPID
 Restart = on-failure
 TimeoutStartSec=<%= @cv_timeout_start_sec %>
-MemoryLimit=<%= @cv_clamd_max_mem %>
+MemoryMax=<%= @cv_clamd_max_mem %>
 CPUQuota=<%= @cv_clamd_cpu_quota %>
 Nice=<%= @cv_nice_value %>
Author	SHA1	Message	Date
Jenkins Server	fbd3e5327d	Merge remote-tracking branch 'origin/master' into jenkins-build-15	2026-09-22 14:32:02 +02:00
12ww1160	dfb9601a5d	OP#785 switch MemoryLimit to MemoryMax	2026-09-22 14:30:56 +02:00
Jenkins Server	3e0ccc94d0	Recommit for updates in build 14	2026-09-22 14:10:46 +02:00