diff options
author | Jeff McCune <jeff@puppetlabs.com> | 2012-08-14 10:08:41 -0700 |
---|---|---|
committer | Jeff McCune <jeff@puppetlabs.com> | 2012-08-14 10:08:41 -0700 |
commit | 77262494b368c115da2a71c4a53e2a9bd21ff2aa (patch) | |
tree | 0ded58647c134dafa32604725b010f32a465164f /lib/puppet/parser/functions/str2saltedsha512.rb | |
parent | f30885118843f2eef15c048fe2cb504d7eaf8f77 (diff) | |
parent | a06c0d8115892a74666676b50d4282df9850a119 (diff) | |
download | puppet-stdlib-77262494b368c115da2a71c4a53e2a9bd21ff2aa.tar.gz puppet-stdlib-77262494b368c115da2a71c4a53e2a9bd21ff2aa.tar.bz2 |
Merge branch 'feature/2.4.x/backport_file_line_match_pr75' into 2.4.x
* feature/2.4.x/backport_file_line_match_pr75:
Add support for a 'match' parameter to file_line
Diffstat (limited to 'lib/puppet/parser/functions/str2saltedsha512.rb')
0 files changed, 0 insertions, 0 deletions