Merge branch 'master' into nested_has_many_through

Conflicts:
	activerecord/CHANGELOG
	activerecord/lib/active_record/association_preload.rb
	activerecord/lib/active_record/associations.rb
	activerecord/test/schema/schema.rb

1 files changed, 0 insertions, 9 deletions

diff --git a/actionpack/lib/action_dispatch/http/rack_cache.rb b/actionpack/lib/action_dispatch/http/rack_cache.rb
index e5914abc81..b5c1435903 100644
--- a/actionpack/lib/action_dispatch/http/rack_cache.rb
+++ b/actionpack/lib/action_dispatch/http/rack_cache.rb
@@ -21,11 +21,6 @@ module ActionDispatch
       @store.write(key, value)
     end
 
-    def purge(key)
-      @store.delete(key)
-      nil
-    end
-
     ::Rack::Cache::MetaStore::RAILS = self
   end
 
@@ -58,10 +53,6 @@ module ActionDispatch
       [key, size]
     end
 
-    def purge(key)
-      @store.delete(key)
-    end
-
     ::Rack::Cache::EntityStore::RAILS = self
   end
 end