From a7c3c9025009cef98cd91ff27707f678cb8fb3c3 Mon Sep 17 00:00:00 2001
From: kennyj <kennyj@gmail.com>
Date: Wed, 31 Oct 2012 02:21:52 +0900
Subject: Fix #6951. Use query cache/uncache, when using not only database.yml
 but also DATABASE_URL.

---
 activerecord/CHANGELOG.md | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'activerecord/CHANGELOG.md')

diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
index f7aed090a4..7d318808de 100644
--- a/activerecord/CHANGELOG.md
+++ b/activerecord/CHANGELOG.md
@@ -1,5 +1,10 @@
 ## Rails 4.0.0 (unreleased) ##
 
+*   Use query cache/uncache when using DATABASE_URL.
+    Fix #6951.
+
+    *kennyj*
+
 *   Added `#none!` method for mutating `ActiveRecord::Relation` objects to a NullRelation.
     It acts like `#none` but modifies relation in place.
 
-- 
cgit v1.2.3