aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2013-07-16 13:00:33 -0300
committerRafael Mendonça França <rafaelmfranca@gmail.com>2013-07-16 13:00:33 -0300
commita96df04aac00fb2b7d91978c24741100230a50d4 (patch)
treee21bbdf73d88548e252e87b55bb8dc6f602517bd /activerecord
parent1900a56669ba1fc6776fe64534ff1f45104e343c (diff)
downloadrails-a96df04aac00fb2b7d91978c24741100230a50d4.tar.gz
rails-a96df04aac00fb2b7d91978c24741100230a50d4.tar.bz2
rails-a96df04aac00fb2b7d91978c24741100230a50d4.zip
Preparing for 3.2.14.rc2 release
Diffstat (limited to 'activerecord')
-rw-r--r--activerecord/CHANGELOG.md4
-rw-r--r--activerecord/lib/active_record/version.rb2
2 files changed, 3 insertions, 3 deletions
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
index 59f670dd4a..6e88e4614a 100644
--- a/activerecord/CHANGELOG.md
+++ b/activerecord/CHANGELOG.md
@@ -1,4 +1,4 @@
-## Rails 3.2.14.rc2 (unreleased) ##
+## Rails 3.2.14.rc2 (Jun 16, 2013) ##
* Do not re-create destroyed association when saving the parent object.
@@ -7,7 +7,7 @@
*Paul Nikitochkin*
-## Rails 3.2.14.rc1 (Jul 8, 2013) ##
+## Rails 3.2.14.rc1 (Jul 12, 2013) ##
* Do not shallow the original exception in `exec_cache` on PostgreSQL adapter.
diff --git a/activerecord/lib/active_record/version.rb b/activerecord/lib/active_record/version.rb
index b220f08663..d6dbb0b74d 100644
--- a/activerecord/lib/active_record/version.rb
+++ b/activerecord/lib/active_record/version.rb
@@ -3,7 +3,7 @@ module ActiveRecord
MAJOR = 3
MINOR = 2
TINY = 14
- PRE = "rc1"
+ PRE = "rc2"
STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
end