Merge branch 'bug/reload_all' of git://github.com/jlee-r7/metasploit-framework into jlee-r7-bug/reload_all

Author: sinn3r

lib/msf/core/module_manager/reloading.rb

@@ -21,9 +21,6 @@ def reload_module(mod)
   #
   # @return (see Msf::ModuleManager::Loading#load_modules)
   def reload_modules
-    self.module_history = {}
-    self.clear
-
     self.enablement_by_type.each_key do |type|
       module_set_by_type[type].clear
       init_module_set(type)
@@ -45,4 +42,4 @@ def reload_modules
 
     count_by_type
   end
-end
+end

lib/msf/core/module_set.rb

@@ -305,7 +305,6 @@ def each_module_list(ary, opts, &block)
   #
   #   @return [String] type of modules
   attr_writer   :module_type
-  attr_accessor :module_history
 
   # Ranks modules based on their constant rank value, if they have one.  Modules without a Rank are treated as if they
   # had {Msf::NormalRanking} for Rank.