Merge pull request #1092 from zilchms/deprecationwarnings

remove deprecated merge function with native puppet
voxpupuli · Apr 23, 2024 · 20ecc47 · 20ecc47
2 parents 66938db + fcb2326
commit 20ecc47
Showing 1 changed file with 1 addition and 4 deletions.
diff --git 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',