diff options
| author | Jesse Wolfe <jes5199@gmail.com> | 2010-08-27 12:49:54 -0700 |
|---|---|---|
| committer | Jesse Wolfe <jes5199@gmail.com> | 2010-08-27 12:50:26 -0700 |
| commit | 21afb51a1b84116b2a906a6959ae588f45135104 (patch) | |
| tree | 48fa0438d0a50202194956344d0cf1f10b17b818 /lib/puppet/resource | |
| parent | 1f3070c4bc77b38e3dd6170cf6a58bee7ec337ac (diff) | |
| parent | 8be1929043f4560bb17a4b06293b3f9a4efcfdbf (diff) | |
| download | puppet-21afb51a1b84116b2a906a6959ae588f45135104.tar.gz puppet-21afb51a1b84116b2a906a6959ae588f45135104.tar.xz puppet-21afb51a1b84116b2a906a6959ae588f45135104.zip | |
Merge commit '2.6.1rc3'
This synchronizes the 2.7 master branch with 2.6.1RC3
The 2.7 next branch has now diverged from master for the first time, as
if contains code that has not reached "release quality" status.
Diffstat (limited to 'lib/puppet/resource')
| -rw-r--r-- | lib/puppet/resource/type.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/puppet/resource/type.rb b/lib/puppet/resource/type.rb index 6296d26e5..f6d378512 100644 --- a/lib/puppet/resource/type.rb +++ b/lib/puppet/resource/type.rb @@ -69,6 +69,7 @@ class Puppet::Resource::Type end scope = subscope(scope, resource) unless resource.title == :main + scope.compiler.add_class(name) unless definition? set_resource_parameters(resource, scope) |