From fcb2326f0f89d5569638d22a54afaf0fe331bb1d Mon Sep 17 00:00:00 2001
From: markuszilch <zilchmarkus@web.de>
Date: Wed, 27 Mar 2024 00:31:50 +0100
Subject: [PATCH] remove deprecated function with native puppet

---
 manifests/user_setup.pp | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/manifests/user_setup.pp b/manifests/user_setup.pp
index 886ac3e4d..63fab79d1 100644
--- a/manifests/user_setup.pp
+++ b/manifests/user_setup.pp
@@ -55,10 +55,7 @@
 
   # On Debian the service is started by default so it must be configured prior
   # to installation which is why it's configured in this file rather than config.pp
-  $config_hash = merge(
-    $jenkins::params::config_hash_defaults,
-    $jenkins::config_hash
-  )
+  $config_hash = $jenkins::params::config_hash_defaults + $jenkins::config_hash
 
   systemd::dropin_file { 'puppet-overrides.conf':
     unit           => 'jenkins.service',