Skip to content

Commit

Permalink
Merge pull request #107 from bastelfreak/merge
Browse files Browse the repository at this point in the history
Replace merge() with native Puppet code
  • Loading branch information
bastelfreak authored Sep 20, 2024
2 parents dc32ee5 + 0052d96 commit 239dcfe
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion manifests/set.pp
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@
'maxelem' => '65536',
}

$actual_options = merge($default_options, $options)
$actual_options = $default_options + $options

if $ensure == 'present' {
# assert "present" target
Expand Down

0 comments on commit 239dcfe

Please sign in to comment.