From a96df04aac00fb2b7d91978c24741100230a50d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?= Date: Tue, 16 Jul 2013 13:00:33 -0300 Subject: [PATCH] Preparing for 3.2.14.rc2 release --- RAILS_VERSION | 2 +- actionmailer/CHANGELOG.md | 7 ++++++- actionmailer/lib/action_mailer/version.rb | 2 +- actionpack/CHANGELOG.md | 7 ++++++- actionpack/lib/action_pack/version.rb | 2 +- activemodel/CHANGELOG.md | 7 ++++++- activemodel/lib/active_model/version.rb | 2 +- activerecord/CHANGELOG.md | 4 ++-- activerecord/lib/active_record/version.rb | 2 +- activeresource/CHANGELOG.md | 7 ++++++- activeresource/lib/active_resource/version.rb | 2 +- activesupport/CHANGELOG.md | 7 ++++++- activesupport/lib/active_support/version.rb | 2 +- railties/CHANGELOG.md | 7 ++++++- railties/lib/rails/version.rb | 2 +- version.rb | 2 +- 16 files changed, 47 insertions(+), 17 deletions(-) diff --git a/RAILS_VERSION b/RAILS_VERSION index 6a5d395522e34..c172f793ad92b 100644 --- a/RAILS_VERSION +++ b/RAILS_VERSION @@ -1 +1 @@ -3.2.14.rc1 +3.2.14.rc2 diff --git a/actionmailer/CHANGELOG.md b/actionmailer/CHANGELOG.md index a8908d713f36e..9cdd3a80ff358 100644 --- a/actionmailer/CHANGELOG.md +++ b/actionmailer/CHANGELOG.md @@ -1,4 +1,9 @@ -## Rails 3.2.14.rc1 (Jul 8, 2013) ## +## Rails 3.2.14.rc2 (Jun 16, 2013) ## + +* No changes. + + +## Rails 3.2.14.rc1 (Jul 12, 2013) ## * No changes. diff --git a/actionmailer/lib/action_mailer/version.rb b/actionmailer/lib/action_mailer/version.rb index f98a402a5368d..564edd7f94bc9 100644 --- a/actionmailer/lib/action_mailer/version.rb +++ b/actionmailer/lib/action_mailer/version.rb @@ -3,7 +3,7 @@ module VERSION #:nodoc: MAJOR = 3 MINOR = 2 TINY = 14 - PRE = "rc1" + PRE = "rc2" STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.') end diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md index bf697a3800fa3..03803d2898861 100644 --- a/actionpack/CHANGELOG.md +++ b/actionpack/CHANGELOG.md @@ -1,4 +1,9 @@ -## Rails 3.2.14.rc1 (Jul 8, 2013) ## +## Rails 3.2.14.rc2 (Jun 16, 2013) ## + +* No changes. + + +## Rails 3.2.14.rc1 (Jul 12, 2013) ## * Merge `:action` from routing scope and assign endpoint if both `:controller` and `:action` are present. The endpoint assignment only occurs if there is diff --git a/actionpack/lib/action_pack/version.rb b/actionpack/lib/action_pack/version.rb index 4189730e759b3..d33d9b60b9850 100644 --- a/actionpack/lib/action_pack/version.rb +++ b/actionpack/lib/action_pack/version.rb @@ -3,7 +3,7 @@ module VERSION #:nodoc: MAJOR = 3 MINOR = 2 TINY = 14 - PRE = "rc1" + PRE = "rc2" STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.') end diff --git a/activemodel/CHANGELOG.md b/activemodel/CHANGELOG.md index 8166246cfc521..9862c2443d319 100644 --- a/activemodel/CHANGELOG.md +++ b/activemodel/CHANGELOG.md @@ -1,4 +1,9 @@ -## Rails 3.2.14.rc1 (Jul 8, 2013) ## +## Rails 3.2.14.rc2 (Jun 16, 2013) ## + +* No changes. + + +## Rails 3.2.14.rc1 (Jul 12, 2013) ## * No changes. diff --git a/activemodel/lib/active_model/version.rb b/activemodel/lib/active_model/version.rb index 277e29eb624be..f19367d606a61 100644 --- a/activemodel/lib/active_model/version.rb +++ b/activemodel/lib/active_model/version.rb @@ -3,7 +3,7 @@ module VERSION #:nodoc: MAJOR = 3 MINOR = 2 TINY = 14 - PRE = "rc1" + PRE = "rc2" STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.') end diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md index 59f670dd4ac03..6e88e4614a2ce 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 b220f08663549..d6dbb0b74d887 100644 --- a/activerecord/lib/active_record/version.rb +++ b/activerecord/lib/active_record/version.rb @@ -3,7 +3,7 @@ module VERSION #:nodoc: MAJOR = 3 MINOR = 2 TINY = 14 - PRE = "rc1" + PRE = "rc2" STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.') end diff --git a/activeresource/CHANGELOG.md b/activeresource/CHANGELOG.md index a4c97dc12cc70..7a07c70a49427 100644 --- a/activeresource/CHANGELOG.md +++ b/activeresource/CHANGELOG.md @@ -1,4 +1,9 @@ -## Rails 3.2.14.rc1 (Jul 8, 2013) ## +## Rails 3.2.14.rc2 (Jun 16, 2013) ## + +* No changes. + + +## Rails 3.2.14.rc1 (Jul 12, 2013) ## * Fixes an issue that ActiveResource models ignores ActiveResource::Base.include_root_in_json. Backported from the now separate repo rails/activeresouce. diff --git a/activeresource/lib/active_resource/version.rb b/activeresource/lib/active_resource/version.rb index 6f0395bba1cd5..0f7bf6034a936 100644 --- a/activeresource/lib/active_resource/version.rb +++ b/activeresource/lib/active_resource/version.rb @@ -3,7 +3,7 @@ module VERSION #:nodoc: MAJOR = 3 MINOR = 2 TINY = 14 - PRE = "rc1" + PRE = "rc2" STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.') end diff --git a/activesupport/CHANGELOG.md b/activesupport/CHANGELOG.md index b27b6194e6a17..4ce63efd199e4 100644 --- a/activesupport/CHANGELOG.md +++ b/activesupport/CHANGELOG.md @@ -1,4 +1,9 @@ -## Rails 3.2.14.rc1 (Jul 8, 2013) ## +## Rails 3.2.14.rc2 (Jun 16, 2013) ## + +* No changes. + + +## Rails 3.2.14.rc1 (Jul 12, 2013) ## * Make `Time.at_with_coercion` retain the second fraction and return local time. diff --git a/activesupport/lib/active_support/version.rb b/activesupport/lib/active_support/version.rb index 9f81b63b368f3..b81d59b69c110 100644 --- a/activesupport/lib/active_support/version.rb +++ b/activesupport/lib/active_support/version.rb @@ -3,7 +3,7 @@ module VERSION #:nodoc: MAJOR = 3 MINOR = 2 TINY = 14 - PRE = "rc1" + PRE = "rc2" STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.') end diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md index 913435f4cdd45..e5a08b11f7099 100644 --- a/railties/CHANGELOG.md +++ b/railties/CHANGELOG.md @@ -1,4 +1,9 @@ -## Rails 3.2.14.rc1 (Jul 8, 2013) ## +## Rails 3.2.14.rc2 (Jun 16, 2013) ## + +* No changes. + + +## Rails 3.2.14.rc1 (Jul 12, 2013) ## * Fix bugs that crashed `rake test:benchmark`, `rails profiler` and `rails benchmarker`. diff --git a/railties/lib/rails/version.rb b/railties/lib/rails/version.rb index bc535fc501351..dfc7cb5ff4533 100644 --- a/railties/lib/rails/version.rb +++ b/railties/lib/rails/version.rb @@ -3,7 +3,7 @@ module VERSION #:nodoc: MAJOR = 3 MINOR = 2 TINY = 14 - PRE = "rc1" + PRE = "rc2" STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.') end diff --git a/version.rb b/version.rb index bc535fc501351..dfc7cb5ff4533 100644 --- a/version.rb +++ b/version.rb @@ -3,7 +3,7 @@ module VERSION #:nodoc: MAJOR = 3 MINOR = 2 TINY = 14 - PRE = "rc1" + PRE = "rc2" STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.') end