diff options
| author | Paul Berry <paul@puppetlabs.com> | 2010-11-09 15:11:36 -0800 |
|---|---|---|
| committer | Paul Berry <paul@puppetlabs.com> | 2010-11-09 15:11:36 -0800 |
| commit | 80adb39d1f4e87fe2fa12bd03df335fc285c0bb6 (patch) | |
| tree | 4be8f5688fc6d6dedf433ad375745a54640d0a3b /lib/puppet/parser/compiler.rb | |
| parent | 2279fe12b32bd626066d9b7637367fcbb293c29b (diff) | |
| parent | 244213c856f3753dd3e06c5f01003f6a0d3f77ef (diff) | |
| download | puppet-80adb39d1f4e87fe2fa12bd03df335fc285c0bb6.tar.gz puppet-80adb39d1f4e87fe2fa12bd03df335fc285c0bb6.tar.xz puppet-80adb39d1f4e87fe2fa12bd03df335fc285c0bb6.zip | |
Merge commit '2.6.3rc2' into next
Manually resolved conflicts:
lib/puppet/parser/ast/resource.rb
spec/unit/parser/ast/resource_spec.rb
Diffstat (limited to 'lib/puppet/parser/compiler.rb')
| -rw-r--r-- | lib/puppet/parser/compiler.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/puppet/parser/compiler.rb b/lib/puppet/parser/compiler.rb index e1227e753..c60e1d4fb 100644 --- a/lib/puppet/parser/compiler.rb +++ b/lib/puppet/parser/compiler.rb @@ -144,7 +144,7 @@ class Puppet::Parser::Compiler if klass = scope.find_hostclass(name) found << name and next if scope.class_scope(klass) - resource = klass.mk_plain_resource(scope) + resource = klass.ensure_in_catalog(scope) # If they've disabled lazy evaluation (which the :include function does), # then evaluate our resource immediately. @@ -220,7 +220,7 @@ class Puppet::Parser::Compiler # Create a resource to model this node, and then add it to the list # of resources. - resource = astnode.mk_plain_resource(topscope) + resource = astnode.ensure_in_catalog(topscope) resource.evaluate |