From 3d25292ae3da2e8cf7a501c69b331a8d08344c59 Mon Sep 17 00:00:00 2001 From: Xavier Noria Date: Mon, 29 Oct 2012 02:17:11 -0700 Subject: 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 --- activesupport/CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'activesupport/CHANGELOG.md') 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: -- cgit v1.2.3