Merge pull request #78 from ripienaar/75.1

(#75) also do not complain about deprecated options anymore

lib/mcollective/config.rb

@@ -120,8 +120,6 @@ def loadconfig(configfile) # rubocop:disable Metrics/MethodLength
               @default_batch_size = Integer(val)
             when "default_batch_sleep_time"
               @default_batch_sleep_time = Float(val)
-            when "topicprefix", "topicsep", "queueprefix", "rpchelptemplate", "helptemplatedir", "registration_splay", "registerinterval", "registration_collective", "registration"
-              Log.warn("Use of deprecated '#{key}' option.  This option is ignored and should be removed from '#{configfile}'")
             else
               # server config might now be choria config which will divirge from mcollective
               # in time, so we only raise this error when it looks like we aren't loading

spec/unit/mcollective/config_spec.rb

@@ -132,20 +132,6 @@ module MCollective
          end
       end
 
-      it 'should log a warning when using a deprecated option' do
-        PluginManager.stubs(:loadclass)
-        PluginManager.stubs("<<")
-
-        ["topicprefix", "topicsep", "queueprefix", "rpchelptemplate", "helptemplatedir"].each do |key|
-          File.expects(:exist?).with("/nonexisting").returns(true)
-          File.expects(:readlines).with("/nonexisting").returns(["#{key} = nan", "libdir = /nonexistinglib"])
-
-          Log.stubs(:warn)
-          Log.expects(:warn).with("Use of deprecated '#{key}' option.  This option is ignored and should be removed from '/nonexisting'")
-          Config.instance.loadconfig("/nonexisting")
-        end
-      end
-
       it 'should enable agents by default' do
         File.expects(:readlines).with("/nonexisting").returns(["libdir=/nonexistinglib"])
         File.expects(:exist?).with("/nonexisting").returns(true)