diff options
| -rwxr-xr-x | bin/puppetmasterd | 1 | ||||
| -rw-r--r-- | lib/puppet/util/autoload.rb | 4 |
2 files changed, 0 insertions, 5 deletions
diff --git a/bin/puppetmasterd b/bin/puppetmasterd index bae11c831..a00186b68 100755 --- a/bin/puppetmasterd +++ b/bin/puppetmasterd @@ -87,7 +87,6 @@ options = [ [ "--debug", "-d", GetoptLong::NO_ARGUMENT ], [ "--help", "-h", GetoptLong::NO_ARGUMENT ], [ "--logdest", "-l", GetoptLong::REQUIRED_ARGUMENT ], - [ "--noca", GetoptLong::NO_ARGUMENT ], [ "--nobucket", GetoptLong::NO_ARGUMENT ], [ "--noreports", GetoptLong::NO_ARGUMENT ], [ "--nonodes", GetoptLong::NO_ARGUMENT ], diff --git a/lib/puppet/util/autoload.rb b/lib/puppet/util/autoload.rb index 4b77fa3eb..5f13d936b 100644 --- a/lib/puppet/util/autoload.rb +++ b/lib/puppet/util/autoload.rb @@ -139,10 +139,6 @@ class Puppet::Util::Autoload # JJM: Search for optional lib directories in each module bundle. module_lib_dirs = Puppet[:modulepath].split(":").collect do |d| Dir.glob("%s/*/{plugins,lib}" % d).select do |f| - if f =~ /lib$/ - # LAK: Deprecated on 2/14/08 - warnonce "Using 'lib' in modules is deprecated; switch %s to 'plugins'" % f - end FileTest.directory?(f) end end.flatten |