diff options
| author | Patrick Carlisle <patrick@puppetlabs.com> | 2012-08-09 15:22:13 -0700 |
|---|---|---|
| committer | Patrick Carlisle <patrick@puppetlabs.com> | 2012-08-09 15:22:13 -0700 |
| commit | 659704831ee9a4d3c83410010884405bdfde7e89 (patch) | |
| tree | 0f9ba027b4f363b23ac3178120b40db567619ec8 /lib/puppet/parser/functions/grep.rb | |
| parent | 15e13fb6b93347003aa3d3666baf531be0472418 (diff) | |
| parent | cdd45298337df80aad757e81eb7457317219c1b7 (diff) | |
Merge branch '2.4.x'
* 2.4.x:
Make sure functions are loaded for each test
Use rvalue functions correctly
(#2157) Make facts_dot_d compatible with external facts
Conflicts:
lib/facter/facter_dot_d.rb
Diffstat (limited to 'lib/puppet/parser/functions/grep.rb')
0 files changed, 0 insertions, 0 deletions