summaryrefslogtreecommitdiff
path: root/lib/puppet
diff options
context:
space:
mode:
authorAdrien Thebo <git@somethingsinistral.net>2013-03-18 15:06:33 -0700
committerAdrien Thebo <git@somethingsinistral.net>2013-03-18 15:06:33 -0700
commit292490b0adefa9385a1940431f15332724f1c6b4 (patch)
tree3061368b4b386c0a0dc5ab0b5ac7c0f1aab2f547 /lib/puppet
parente0a2dc5b918482a5c05c0d7a6647f4e8a537616f (diff)
parentc12d3d7d51da4107f5e0b63aacc4fcb2c5923a0b (diff)
downloadpuppet-stdlib-292490b0adefa9385a1940431f15332724f1c6b4.tar.gz
puppet-stdlib-292490b0adefa9385a1940431f15332724f1c6b4.tar.bz2
Merge branch '3.x' into 4.x
Diffstat (limited to 'lib/puppet')
-rw-r--r--lib/puppet/parser/functions/flatten.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/puppet/parser/functions/flatten.rb b/lib/puppet/parser/functions/flatten.rb
index 781da78..a1ed183 100644
--- a/lib/puppet/parser/functions/flatten.rb
+++ b/lib/puppet/parser/functions/flatten.rb
@@ -16,7 +16,7 @@ Would return: ['a','b','c']
) do |arguments|
raise(Puppet::ParseError, "flatten(): Wrong number of arguments " +
- "given (#{arguments.size} for 1)") if arguments.size < 1
+ "given (#{arguments.size} for 1)") if arguments.size != 1
array = arguments[0]