aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVijay Dev <vijaydev.cse@gmail.com>2011-12-20 23:44:33 +0530
committerVijay Dev <vijaydev.cse@gmail.com>2011-12-20 23:44:47 +0530
commit10a5497f2eafeb95c373175238197eac6ceb5070 (patch)
treed2e87446a82afecf13e2e4e60f07d73fd04488b8
parent226b4ae79cdd348f203baddb3ec1f8842f920c4c (diff)
downloadrails-10a5497f2eafeb95c373175238197eac6ceb5070.tar.gz
rails-10a5497f2eafeb95c373175238197eac6ceb5070.tar.bz2
rails-10a5497f2eafeb95c373175238197eac6ceb5070.zip
NullStore cache belongs in Active Support
-rw-r--r--activerecord/CHANGELOG.md4
-rw-r--r--activesupport/CHANGELOG.md2
2 files changed, 2 insertions, 4 deletions
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
index cd8e50b33a..348873d759 100644
--- a/activerecord/CHANGELOG.md
+++ b/activerecord/CHANGELOG.md
@@ -147,10 +147,6 @@
*Aaron Christy*
-* Add ActiveSupport::Cache::NullStore for use in development and testing.
-
- *Brian Durand*
-
## Rails 3.1.3 (unreleased) ##
* Perf fix: If we're deleting all records in an association, don't add a IN(..) clause
diff --git a/activesupport/CHANGELOG.md b/activesupport/CHANGELOG.md
index 8299a3fc45..f23ee6e045 100644
--- a/activesupport/CHANGELOG.md
+++ b/activesupport/CHANGELOG.md
@@ -5,6 +5,8 @@
## Rails 3.2.0 (unreleased) ##
+* Add ActiveSupport::Cache::NullStore for use in development and testing. *Brian Durand*
+
* Added Enumerable#pluck to wrap the common pattern of collect(&:method) *DHH*
* Module#synchronize is deprecated with no replacement. Please use `monitor`