diff options
| author | Luke Kanies <luke@reductivelabs.com> | 2010-01-07 17:23:31 -0800 |
|---|---|---|
| committer | test branch <puppet-dev@googlegroups.com> | 2010-02-17 06:50:53 -0800 |
| commit | d0389f4d16efbeccf47d6cd2f1b0854ccb1c88d5 (patch) | |
| tree | 3a3060ac94be20b25742f5ec956e95c8ff3633d8 /lib/puppet/application | |
| parent | 67ef78d9f231661d0fdd6260d470cf0d06f1bac2 (diff) | |
| download | puppet-d0389f4d16efbeccf47d6cd2f1b0854ccb1c88d5.tar.gz puppet-d0389f4d16efbeccf47d6cd2f1b0854ccb1c88d5.tar.xz puppet-d0389f4d16efbeccf47d6cd2f1b0854ccb1c88d5.zip | |
Renaming Parser::ResourceType to Resource::Type
Basically, these classes (ResourceType and ResourceTypeCollection)
don't really belong in Parser, so I'm moving them to the
Resource namespace. This will be where anything RAL-related goes
from now on, and as we migrate functionality out of Puppet::Type,
it should go here.
Signed-off-by: Luke Kanies <luke@reductivelabs.com>
Diffstat (limited to 'lib/puppet/application')
| -rw-r--r-- | lib/puppet/application/main.rb | 2 | ||||
| -rw-r--r-- | lib/puppet/application/server.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/puppet/application/main.rb b/lib/puppet/application/main.rb index 3813df612..2952ef4ae 100644 --- a/lib/puppet/application/main.rb +++ b/lib/puppet/application/main.rb @@ -72,7 +72,7 @@ Puppet::Application.new(:main) do Puppet[:manifest] = ARGV.shift end begin - Puppet::Parser::ResourceTypeCollection.new(Puppet[:environment]).perform_initial_import + Puppet::Resource::TypeCollection.new(Puppet[:environment]).perform_initial_import rescue => detail Puppet.err detail exit 1 diff --git a/lib/puppet/application/server.rb b/lib/puppet/application/server.rb index e9253c6f9..afdad54fb 100644 --- a/lib/puppet/application/server.rb +++ b/lib/puppet/application/server.rb @@ -69,7 +69,7 @@ Puppet::Application.new(:server) do command(:parseonly) do begin - Puppet::Parser::ResourceTypeCollection.new(Puppet[:environment]).perform_initial_import + Puppet::Resource::TypeCollection.new(Puppet[:environment]).perform_initial_import rescue => detail Puppet.err detail exit 1 |