Merge pull request #1063 from kajinamit/stdlib-func

TheMeier · web-flow · commit 0b880cedf7f6 · 2025-08-15T11:49:20.000+02:00
Use namespace function from stdlib
diff --git a/manifests/config.pp b/manifests/config.pp
@@ -149,7 +149,7 @@
         default           => "\"${orig}${ssl_path} -proto_dist ${proto_dist}\"",
       }
 
-      merge($memo, { "RABBITMQ_${item}_ERL_ARGS" => $munged })
+      stdlib::merge($memo, { "RABBITMQ_${item}_ERL_ARGS" => $munged })
     }
 
     $environment_variables = $_environment_variables + $ipv6_or_tls_env
diff --git a/metadata.json b/metadata.json
@@ -60,7 +60,7 @@
   "dependencies": [
     {
       "name": "puppetlabs/stdlib",
-      "version_requirement": ">= 4.25.0 < 10.0.0"
+      "version_requirement": ">= 9.0.0 < 10.0.0"
     },
     {
       "name": "puppet/archive",

Original file line number	Diff line number	Diff line change
`@@ -149,7 +149,7 @@`
`149`	`149`	`default => "\"${orig}${ssl_path} -proto_dist ${proto_dist}\"",`
`150`	`150`	`}`
`151`	`151`
`152`		`- merge($memo, { "RABBITMQ_${item}_ERL_ARGS" => $munged })`
	`152`	`+ stdlib::merge($memo, { "RABBITMQ_${item}_ERL_ARGS" => $munged })`
`153`	`153`	`}`
`154`	`154`
`155`	`155`	`$environment_variables = $_environment_variables + $ipv6_or_tls_env`