6 files changed, 8 insertions, 55 deletions
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
index abc134b11c..f8ef03aebb 100644
--- a/activerecord/CHANGELOG.md
+++ b/activerecord/CHANGELOG.md
@@ -1,3 +1,7 @@
+*   Remove deprecation warning for `auto_explain_threshold_in_seconds`.
+
+    *Yves Senn*
+
 *   Remove deprecated `:distinct` option from `Relation#count`.
 
     *Yves Senn*
diff --git a/activerecord/lib/active_record/railtie.rb b/activerecord/lib/active_record/railtie.rb
index afb0be7b74..4b455594d4 100644
--- a/activerecord/lib/active_record/railtie.rb
+++ b/activerecord/lib/active_record/railtie.rb
@@ -135,17 +135,6 @@ module ActiveRecord
             EOF
           end
 
-          unless app.config.active_record.delete(:auto_explain_threshold_in_seconds).nil?
-            ActiveSupport::Deprecation.warn <<-EOF.strip_heredoc, []
-              The Active Record auto explain feature has been removed.
-
-              To disable this message remove the `active_record.auto_explain_threshold_in_seconds`
-              option from the `config/environments/*.rb` config file.
-
-              See http://guides.rubyonrails.org/4_0_release_notes.html for more information.
-            EOF
-          end
-
           unless app.config.active_record.delete(:observers).nil?
             ActiveSupport::Deprecation.warn <<-EOF.strip_heredoc, []
               Active Record Observers has been extracted out of Rails into a gem.
diff --git a/activesupport/CHANGELOG.md b/activesupport/CHANGELOG.md
index ecf856daf7..2f440d7e52 100644
--- a/activesupport/CHANGELOG.md
+++ b/activesupport/CHANGELOG.md
@@ -1,3 +1,7 @@
+*   Remove deprecated `BufferedLogger`.
+
+    *Yves Senn*
+
 *   Remove deprecated `assert_present` and `assert_blank` methods.
 
     *Yves Senn*
diff --git a/activesupport/lib/active_support/buffered_logger.rb b/activesupport/lib/active_support/buffered_logger.rb
deleted file mode 100644
index 1cd0c2f790..0000000000
--- a/activesupport/lib/active_support/buffered_logger.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-require 'active_support/deprecation'
-require 'active_support/logger'
-
-module ActiveSupport
-  class BufferedLogger < Logger
-
-    def initialize(*args)
-      self.class._deprecation_warning
-      super
-    end
-
-    def self.inherited(*)
-      _deprecation_warning
-      super
-    end
-
-    def self._deprecation_warning
-      ::ActiveSupport::Deprecation.warn 'ActiveSupport::BufferedLogger is deprecated! Use ActiveSupport::Logger instead.'
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/log_subscriber/test_helper.rb b/activesupport/lib/active_support/log_subscriber/test_helper.rb
index f9a98686d3..e50784ea0e 100644
--- a/activesupport/lib/active_support/log_subscriber/test_helper.rb
+++ b/activesupport/lib/active_support/log_subscriber/test_helper.rb
@@ -1,5 +1,4 @@
 require 'active_support/log_subscriber'
-require 'active_support/buffered_logger'
 require 'active_support/notifications'
 
 module ActiveSupport
diff --git a/activesupport/test/deprecation/buffered_logger_test.rb b/activesupport/test/deprecation/buffered_logger_test.rb
deleted file mode 100644
index bf11a4732c..0000000000
--- a/activesupport/test/deprecation/buffered_logger_test.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-require 'abstract_unit'
-require 'active_support/buffered_logger'
-
-class BufferedLoggerTest < ActiveSupport::TestCase
-
-  def test_can_be_subclassed
-    warn = 'ActiveSupport::BufferedLogger is deprecated! Use ActiveSupport::Logger instead.'
-
-    ActiveSupport::Deprecation.expects(:warn).with(warn).once
-
-    Class.new(ActiveSupport::BufferedLogger)
-  end
-
-  def test_issues_deprecation_when_instantiated
-    warn = 'ActiveSupport::BufferedLogger is deprecated! Use ActiveSupport::Logger instead.'
-
-    ActiveSupport::Deprecation.expects(:warn).with(warn).once
-
-    ActiveSupport::BufferedLogger.new(STDOUT)
-  end
-
-end