summaryrefslogtreecommitdiff
path: root/lib/puppet/parser/functions
diff options
context:
space:
mode:
authorHunter Haugen <hunter@puppetlabs.com>2016-04-11 15:02:58 -0700
committerHunter Haugen <hunter@puppetlabs.com>2016-04-11 15:02:58 -0700
commite3a6e2c601416ed7c656ccaf75eaec967f4eb687 (patch)
tree44f7aeb8e5288e65d6afe1185a0e9e55533c7e91 /lib/puppet/parser/functions
parent60864fd39bcb22886749fc6d0a54eb09f8048516 (diff)
parent44596e73da1b157ea931d5111f842e108ca203bb (diff)
Merge pull request #590 from alext/fix_concat_with_hash
(MODULES-3246) Fix concat with Hash arguments.
Diffstat (limited to 'lib/puppet/parser/functions')
-rw-r--r--lib/puppet/parser/functions/concat.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/puppet/parser/functions/concat.rb b/lib/puppet/parser/functions/concat.rb
index 618e62d..91edb4e 100644
--- a/lib/puppet/parser/functions/concat.rb
+++ b/lib/puppet/parser/functions/concat.rb
@@ -31,7 +31,7 @@ Would result in:
arguments.shift
arguments.each do |x|
- result = result + Array(x)
+ result = result + (x.is_a?(Array) ? x : [x])
end
return result