projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update puppetlabs/stdlib module
[mirror/dsa-puppet.git]
/
3rdparty
/
modules
/
stdlib
/
lib
/
puppet
/
parser
/
functions
/
union.rb
diff --git
a/3rdparty/modules/stdlib/lib/puppet/parser/functions/union.rb
b/3rdparty/modules/stdlib/lib/puppet/parser/functions/union.rb
index
abe2dc8
..
ed57bc5
100644
(file)
--- a/
3rdparty/modules/stdlib/lib/puppet/parser/functions/union.rb
+++ b/
3rdparty/modules/stdlib/lib/puppet/parser/functions/union.rb
@@
-1,18
+1,17
@@
#
# union.rb
#
#
# union.rb
#
-
module Puppet::Parser::Functions
module Puppet::Parser::Functions
- newfunction(:union, :type => :rvalue, :doc => <<-
EOS
-This function returns a union of two or more arrays.
+ newfunction(:union, :type => :rvalue, :doc => <<-
DOC
+
This function returns a union of two or more arrays.
-*Examples:*
+
*Examples:*
- union(["a","b","c"],["b","c","d"])
+
union(["a","b","c"],["b","c","d"])
-Would return: ["a","b","c","d"]
- EOS
- ) do |arguments|
+
Would return: ["a","b","c","d"]
+ DOC
+
) do |arguments|
# Check that 2 or more arguments have been given ...
raise(Puppet::ParseError, "union(): Wrong number of arguments given (#{arguments.size} for < 2)") if arguments.size < 2
# Check that 2 or more arguments have been given ...
raise(Puppet::ParseError, "union(): Wrong number of arguments given (#{arguments.size} for < 2)") if arguments.size < 2