diff options
| author | Micah Anderson <micah@riseup.net> | 2010-09-02 19:04:29 -0400 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2010-09-02 19:04:29 -0400 |
| commit | 63a16ad8c07e880e68cb7c0a895f7e26ca1434f8 (patch) | |
| tree | 1ca7da340aef82e8fe87f44c680cedc93795ecbf /lib/puppet/parser/functions/basename.rb | |
| parent | 76b0a31a76b8ab7509da3389379daa24b0610f73 (diff) | |
| parent | 51e06fd0d2fa1c8999f328051e5e717bc18e77e7 (diff) | |
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/basename.rb')
0 files changed, 0 insertions, 0 deletions