diff options
| author | James Turnbull <james@lovedthanlost.net> | 2010-01-13 08:07:30 +1100 |
|---|---|---|
| committer | James Turnbull <james@lovedthanlost.net> | 2010-01-13 08:07:30 +1100 |
| commit | b6f90dfcd96123c245b6f5fd93753790006387c0 (patch) | |
| tree | 1668fd8ed480dc0d0cb49c4a3d7f8a13c77dbeb9 /lib/puppet/parser/functions/shellquote.rb | |
| parent | e26e8319186c57a41ea7ca58b0e8e853e9b452e3 (diff) | |
| parent | f7e14356ad7781fafa52a459d3c24372fa6c0900 (diff) | |
| download | puppet-b6f90dfcd96123c245b6f5fd93753790006387c0.tar.gz puppet-b6f90dfcd96123c245b6f5fd93753790006387c0.tar.xz puppet-b6f90dfcd96123c245b6f5fd93753790006387c0.zip | |
Merge branch '0.25.x'
Conflicts:
lib/puppet/ssl/host.rb
spec/spec_helper.rb
Diffstat (limited to 'lib/puppet/parser/functions/shellquote.rb')
| -rw-r--r-- | lib/puppet/parser/functions/shellquote.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/puppet/parser/functions/shellquote.rb b/lib/puppet/parser/functions/shellquote.rb index 6c994520c..0a7ae5958 100644 --- a/lib/puppet/parser/functions/shellquote.rb +++ b/lib/puppet/parser/functions/shellquote.rb @@ -10,7 +10,7 @@ module Puppet::Parser::Functions with spaces. If an argument is an array, the elements of that array is interpolated within the rest of the arguments; this makes it possible to have an array of arguments and pass that array to - shellquote() instead of having to specify specify each argument + shellquote() instead of having to specify each argument individually in the call. ") \ do |args| |