Skip to content

Commit 0462b3b

Browse files
hawkeye-7bastelfreak
authored andcommitted
Suppress depecation warning
1 parent 6177fdd commit 0462b3b

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

manifests/config.pp

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
}
2121

2222
if $merge_options {
23-
$_global_options = merge($haproxy::params::global_options, $global_options)
24-
$_defaults_options = merge($haproxy::params::defaults_options, $defaults_options)
23+
$_global_options = $haproxy::params::global_options + $global_options
24+
$_defaults_options = $haproxy::params::defaults_options + $defaults_options
2525
} else {
2626
$_global_options = $global_options
2727
$_defaults_options = $defaults_options

0 commit comments

Comments
 (0)