aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/CHANGELOG.md
diff options
context:
space:
mode:
authorGuillermo Iguaran <guilleiguaran@gmail.com>2014-01-03 13:43:16 -0800
committerGuillermo Iguaran <guilleiguaran@gmail.com>2014-01-03 13:43:16 -0800
commit88c3fd1ef1f3bbd4f8fdc15887cc382a287fbd10 (patch)
tree3af6b6433215c77247b87b64a2e2587f512484b0 /activesupport/CHANGELOG.md
parent05a81c5fe2efe08a171cd3dbef3873c1f0e5fae3 (diff)
parente7f56a7fe8fbb10e62a18b836c27aa1a0f7c5464 (diff)
downloadrails-88c3fd1ef1f3bbd4f8fdc15887cc382a287fbd10.tar.gz
rails-88c3fd1ef1f3bbd4f8fdc15887cc382a287fbd10.tar.bz2
rails-88c3fd1ef1f3bbd4f8fdc15887cc382a287fbd10.zip
Merge pull request #13583 from arthurnn/mem_cache_store_fix
mem_cache_store requires dalli, so only accept dalli/client
Diffstat (limited to 'activesupport/CHANGELOG.md')
-rw-r--r--activesupport/CHANGELOG.md4
1 files changed, 4 insertions, 0 deletions
diff --git a/activesupport/CHANGELOG.md b/activesupport/CHANGELOG.md
index 19db8ac873..973eaef471 100644
--- a/activesupport/CHANGELOG.md
+++ b/activesupport/CHANGELOG.md
@@ -1,3 +1,7 @@
+* MemCacheStore should only accept a Dalli::Client, or create one.
+
+ *arthurnn*
+
* Don't lazy load the `tzinfo` library as it causes problems on Windows.
Fixes #13553