Skip to content

Commit c9c29db

Browse files
Make merge parameter data types actually backwards compatible
`Hash` defaults to `Hash[Scalar,Data]` however, class/type references are valid hash values but are not covered by the `Data` type. see also voxpupuli/puppet-jenkins#909
1 parent 146090e commit c9c29db

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

lib/puppet/functions/merge.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
# @return
4141
# The merged hash
4242
dispatch :merge2hashes do
43-
repeated_param 'Variant[Hash, Undef, String[0,0]]', :args # this strange type is backwards compatible
43+
repeated_param 'Variant[Hash[Scalar,Any], Undef, String[0,0]]', :args # this strange type is backwards compatible
4444
return_type 'Hash'
4545
end
4646

0 commit comments

Comments
 (0)