aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/CHANGELOG
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2010-01-27 17:09:55 -0800
committerJeremy Kemper <jeremy@bitsweat.net>2010-01-27 17:09:55 -0800
commit8399a315f5a2dc1dd3d9efd75d66151c793fa664 (patch)
treea22a99d173bf059616ef57ce2062befc811adc6d /activesupport/CHANGELOG
parent7b8c6472ffb6df4d341b0657f82e63c19e9a429c (diff)
parenta06a5a64ba8f7d7b11025d136013b48a01ccdcc8 (diff)
downloadrails-8399a315f5a2dc1dd3d9efd75d66151c793fa664.tar.gz
rails-8399a315f5a2dc1dd3d9efd75d66151c793fa664.tar.bz2
rails-8399a315f5a2dc1dd3d9efd75d66151c793fa664.zip
Merge remote branch 'mikel/master'
Diffstat (limited to 'activesupport/CHANGELOG')
-rw-r--r--activesupport/CHANGELOG6
1 files changed, 6 insertions, 0 deletions
diff --git a/activesupport/CHANGELOG b/activesupport/CHANGELOG
index 0454cb731d..cd72aa1bee 100644
--- a/activesupport/CHANGELOG
+++ b/activesupport/CHANGELOG
@@ -1,5 +1,11 @@
*Edge*
+* Unvendor'd Memcach Client. Now requires the Builder gem as a dependency [Mikel Lindsaar]
+
+* Unvendor'd Builder. Now requires the Builder gem as a dependency [Mikel Lindsaar]
+
+* Unvendor'd TZInfo. Now requires the TZInfo gem as a dependency [Mikel Lindsaar]
+
* YAML serialization for OrderedHash. #3608 [Gregor Schmidt]
* Update bundled TZInfo to v0.3.16 [Geoff Buesing]