diff options
| author | Luke Kanies <luke@madstop.com> | 2007-09-10 17:58:23 -0500 |
|---|---|---|
| committer | Luke Kanies <luke@madstop.com> | 2007-09-10 17:58:23 -0500 |
| commit | bb69a1f08a6b0ba37222eeddf28ffbff657283e7 (patch) | |
| tree | 4e8f3a6d710445a218f87b0ab712f63d7b292914 /lib/puppet/util | |
| parent | 81149333c360d6f10e6c1cf58f43b6e18c0a55dc (diff) | |
| download | puppet-bb69a1f08a6b0ba37222eeddf28ffbff657283e7.tar.gz puppet-bb69a1f08a6b0ba37222eeddf28ffbff657283e7.tar.xz puppet-bb69a1f08a6b0ba37222eeddf28ffbff657283e7.zip | |
Renaming the instance loader method to "instance_load". It was previously autoload, which could class with Kernel.autoload.
Diffstat (limited to 'lib/puppet/util')
| -rwxr-xr-x | lib/puppet/util/instance_loader.rb | 2 | ||||
| -rw-r--r-- | lib/puppet/util/reference.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/puppet/util/instance_loader.rb b/lib/puppet/util/instance_loader.rb index 3613b4e39..1a64c9c69 100755 --- a/lib/puppet/util/instance_loader.rb +++ b/lib/puppet/util/instance_loader.rb @@ -6,7 +6,7 @@ require 'puppet/util' module Puppet::Util::InstanceLoader include Puppet::Util # Define a new type of autoloading. - def autoload(type, path, options = {}) + def instance_load(type, path, options = {}) @autoloaders ||= {} @instances ||= {} type = symbolize(type) diff --git a/lib/puppet/util/reference.rb b/lib/puppet/util/reference.rb index ce3d6550c..3446aeb06 100644 --- a/lib/puppet/util/reference.rb +++ b/lib/puppet/util/reference.rb @@ -7,7 +7,7 @@ class Puppet::Util::Reference extend Puppet::Util::InstanceLoader - autoload(:reference, 'puppet/reference') + instance_load(:reference, 'puppet/reference') def self.footer "\n\n----------------\n\n*This page autogenerated on %s*\n" % Time.now |