Merge branch 'master' of git://labs.riseup.net/shared-common

Conflicts:
	lib/puppet/parser/functions/gsub.rb
	lib/puppet/parser/functions/prefix_with.rb
	lib/puppet/parser/functions/slash_escape.rb
	lib/puppet/parser/functions/split.rb
	lib/puppet/parser/functions/substitute.rb
	manifests/classes/lsb_release.pp
	manifests/defines/concatenated_file.pp
	manifests/defines/config_file.pp
	manifests/defines/line.pp
	manifests/defines/module_dir.pp
	manifests/defines/module_file.pp
	manifests/defines/replace.pp
	manifests/init.pp

1 files changed, 10 insertions, 0 deletions

diff --git a/lib/puppet/parser/functions/join.rb b/lib/puppet/parser/functions/join.rb
new file mode 100644
index 0000000..95b664c
--- /dev/null
+++ b/lib/puppet/parser/functions/join.rb
@@ -0,0 +1,10 @@
+Puppet::Parser::Functions::newfunction(
+  :join,
+  :type => :rvalue,
+  :doc => "Joins the values of the array in arg1 with the string in arg2
+
+    Example: join(['a','b'],',') -> 'a,b'"
+) do |args|
+  raise Puppet::ParseError, 'join() needs two arguments' if args.length != 2
+  args[0].to_a.join(args[1])
+end