diff options
| author | Matt Robinson <matt@puppetlabs.com> | 2010-12-16 14:50:39 -0800 |
|---|---|---|
| committer | Matt Robinson <matt@puppetlabs.com> | 2010-12-16 14:50:39 -0800 |
| commit | cc1f2b39a65e8b74c8e59a2bf7d8f47a35985ee4 (patch) | |
| tree | 2be10cd07b1c8c45d63ec38adb7f35927841b864 /lib/puppet/parser/templatewrapper.rb | |
| parent | 52ca8c78c270b93ce997217900a3d333ad8154cc (diff) | |
| parent | b4035315aaad37df97d4e620b4f972cad201d04f (diff) | |
| download | puppet-cc1f2b39a65e8b74c8e59a2bf7d8f47a35985ee4.tar.gz puppet-cc1f2b39a65e8b74c8e59a2bf7d8f47a35985ee4.tar.xz puppet-cc1f2b39a65e8b74c8e59a2bf7d8f47a35985ee4.zip | |
Merge branch '2.6.next' into 2.6.x
* 2.6.next:
maint: Fix ActiveRecord confine issue
maint: Fix a test that was missing a require
maint: Fix tests that don't run on their own
Diffstat (limited to 'lib/puppet/parser/templatewrapper.rb')
| -rw-r--r-- | lib/puppet/parser/templatewrapper.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/puppet/parser/templatewrapper.rb b/lib/puppet/parser/templatewrapper.rb index 73a4ad8aa..6864aa1a9 100644 --- a/lib/puppet/parser/templatewrapper.rb +++ b/lib/puppet/parser/templatewrapper.rb @@ -1,6 +1,7 @@ # A simple wrapper for templates, so they don't have full access to # the scope objects. require 'puppet/parser/files' +require 'erb' class Puppet::Parser::TemplateWrapper attr_writer :scope |