Removing deprecated :pluginpath setting

Signed-off-by: Luke Kanies <luke@madstop.com>

2 files changed, 3 insertions, 9 deletions

diff --git a/lib/puppet/defaults.rb b/lib/puppet/defaults.rb
index a2ccd8a05..f42f6e055 100644
--- a/lib/puppet/defaults.rb
+++ b/lib/puppet/defaults.rb
@@ -545,12 +545,6 @@ module Puppet
 
     # Plugin information.
     self.setdefaults(:main,
-        :pluginpath => {:default => "$vardir/plugins/",
-            :desc => "Where Puppet should look for plugins.  Multiple directories should
-            be colon-separated, like normal PATH variables.  As of 0.23.1, this
-            option is deprecated; download your custom libraries to the $libdir
-            instead.",
-            :type => :element}, # Don't consider this a file, since it's a colon-separated list.
         :plugindest => ["$libdir",
             "Where Puppet should store plugins that it pulls down from the central
             server."],
diff --git a/spec/integration/defaults.rb b/spec/integration/defaults.rb
index a7c330509..a99a54435 100755
--- a/spec/integration/defaults.rb
+++ b/spec/integration/defaults.rb
@@ -53,13 +53,13 @@ describe "Puppet defaults" do
         Puppet.settings[:bindaddress].should == ""
     end
 
-    [:factdest, :pluginpath].each do |setting|
-        it "should force the #{setting} to be a directory" do
+    [:factdest].each do |setting|
+        it "should force the :factdest to be a directory" do
             Puppet.settings[setting].should =~ /\/$/
         end
     end
 
-    [:modulepath, :pluginpath, :factpath].each do |setting|
+    [:modulepath, :factpath].each do |setting|
         it "should configure '#{setting}' not to be a file setting, so multi-directory settings are acceptable" do
             Puppet.settings.element(setting).should be_instance_of(Puppet::Util::Settings::CElement)
         end