aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/CHANGELOG.md
diff options
context:
space:
mode:
authorXavier Noria <fxn@hashref.com>2012-10-29 02:17:11 -0700
committerCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2012-11-08 20:50:05 -0200
commit3d25292ae3da2e8cf7a501c69b331a8d08344c59 (patch)
treebc9e395d0b2ec735a84efcf30bbe4c50f90c5aae /activesupport/CHANGELOG.md
parent5222a33d0dc67f4984e26ccab46722b4ee2277d5 (diff)
downloadrails-3d25292ae3da2e8cf7a501c69b331a8d08344c59.tar.gz
rails-3d25292ae3da2e8cf7a501c69b331a8d08344c59.tar.bz2
rails-3d25292ae3da2e8cf7a501c69b331a8d08344c59.zip
Merge pull request #8027 from daenney/master
Atomic.rb assumes it may chown/chmod a file but doesn't handle the EPERM error. Conflicts: activesupport/CHANGELOG.md guides/source/active_support_core_extensions.md
Diffstat (limited to 'activesupport/CHANGELOG.md')
-rw-r--r--activesupport/CHANGELOG.md7
1 files changed, 7 insertions, 0 deletions
diff --git a/activesupport/CHANGELOG.md b/activesupport/CHANGELOG.md
index 76a232665f..c54e933fdc 100644
--- a/activesupport/CHANGELOG.md
+++ b/activesupport/CHANGELOG.md
@@ -1,3 +1,10 @@
+## Rails 3.2.10 (unreleased)
+
+* Handle the possible Permission Denied errors atomic.rb might trigger due to
+ its chown and chmod calls. [Backport #8027]
+
+ *Daniele Sluijters*
+
## Rails 3.2.9 (unreleased)
* Add logger.push_tags and .pop_tags to complement logger.tagged: