aboutsummaryrefslogtreecommitdiff
path: root/lib/puppet/parser/functions/prefix_with.rb
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2010-09-02 19:04:29 -0400
committerMicah Anderson <micah@riseup.net>2010-09-02 19:04:29 -0400
commit63a16ad8c07e880e68cb7c0a895f7e26ca1434f8 (patch)
tree1ca7da340aef82e8fe87f44c680cedc93795ecbf /lib/puppet/parser/functions/prefix_with.rb
parent76b0a31a76b8ab7509da3389379daa24b0610f73 (diff)
parent51e06fd0d2fa1c8999f328051e5e717bc18e77e7 (diff)
downloadpuppet-common-63a16ad8c07e880e68cb7c0a895f7e26ca1434f8.tar.gz
puppet-common-63a16ad8c07e880e68cb7c0a895f7e26ca1434f8.tar.bz2
Merge remote branch 'immerda/master'
Conflicts: lib/puppet/parser/functions/gsub.rb lib/puppet/parser/functions/prefix_with.rb lib/puppet/parser/functions/sha1.rb lib/puppet/parser/functions/slash_escape.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
Diffstat (limited to 'lib/puppet/parser/functions/prefix_with.rb')
-rw-r--r--lib/puppet/parser/functions/prefix_with.rb14
1 files changed, 2 insertions, 12 deletions
diff --git a/lib/puppet/parser/functions/prefix_with.rb b/lib/puppet/parser/functions/prefix_with.rb
index 5a12986..6e64a4a 100644
--- a/lib/puppet/parser/functions/prefix_with.rb
+++ b/lib/puppet/parser/functions/prefix_with.rb
@@ -1,15 +1,5 @@
-# Prefixes arguments 2..n with first argument.
-#
-# prefix_with(string prefix, string[] arguments) : string[]
-#
-# Example:
-#
-# prefix_with("php-", [ "blah", "foo" ])
-#
-# will result in this array:
-#
-# [ "php-blah", "php-foo" ]
-#
+# prefix arguments 2..n with first argument
+
module Puppet::Parser::Functions
newfunction(:prefix_with, :type => :rvalue) do |args|
prefix = args.shift