summaryrefslogtreecommitdiffstats
path: root/lib/puppet/parser/templatewrapper.rb
diff options
context:
space:
mode:
authorMatt Robinson <matt@puppetlabs.com>2010-11-22 15:02:12 -0800
committerMatt Robinson <matt@puppetlabs.com>2010-11-22 15:02:12 -0800
commit9914140377a82b6c2de45685f565b2607d8b8364 (patch)
tree4b0da9bf07dfd0e0a6be747019af58275b57b6b8 /lib/puppet/parser/templatewrapper.rb
parenta95783f6d6044789e6a0408976126757d4e9f084 (diff)
parent4a2bbbcf197760ce2eb3c257742293794d6fb571 (diff)
downloadpuppet-9914140377a82b6c2de45685f565b2607d8b8364.tar.gz
puppet-9914140377a82b6c2de45685f565b2607d8b8364.tar.xz
puppet-9914140377a82b6c2de45685f565b2607d8b8364.zip
Merge branch 'maint/next/all_tests_run_on_their_own' into next
* maint/next/all_tests_run_on_their_own: 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.rb1
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