Made ready to push RC2

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2684 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

8 files changed, 16 insertions, 8 deletions

diff --git a/actionmailer/Rakefile b/actionmailer/Rakefile
index 9f692f4677..d6cbbf73d7 100755
--- a/actionmailer/Rakefile
+++ b/actionmailer/Rakefile
@@ -53,7 +53,7 @@ spec = Gem::Specification.new do |s|
   s.rubyforge_project = "actionmailer"
   s.homepage = "http://www.rubyonrails.org"
 
-  s.add_dependency('actionpack', '= 1.10.0' + PKG_BUILD)
+  s.add_dependency('actionpack', '= 1.10.1' + PKG_BUILD)
 
   s.has_rdoc = true
   s.requirements << 'none'
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG
index 993ccbd122..83a7187e40 100644
--- a/actionpack/CHANGELOG
+++ b/actionpack/CHANGELOG
@@ -1,7 +1,10 @@
+*1.10.1* (October 19th, 2005)
+
 * Update error trace templates [Nicholas Seckar]
 
 * Stop showing generated routing code in application traces [Nicholas Seckar]
 
+
 *1.10.0* (October 16th, 2005)
 
 * Make string-keys locals assigns optional. Add documentation describing depreciated state [skaes@web.de]
diff --git a/actionpack/lib/action_pack/version.rb b/actionpack/lib/action_pack/version.rb
index fd7daa8b97..3bc83cd75a 100644
--- a/actionpack/lib/action_pack/version.rb
+++ b/actionpack/lib/action_pack/version.rb
@@ -2,7 +2,7 @@ module ActionPack
   module Version #:nodoc:
     MAJOR = 1
     MINOR = 10
-    TINY  = 0
+    TINY  = 1
     
     STRING = [MAJOR, MINOR, TINY].join('.')
   end
diff --git a/actionwebservice/Rakefile b/actionwebservice/Rakefile
index 6bb90254ae..d8fd678997 100644
--- a/actionwebservice/Rakefile
+++ b/actionwebservice/Rakefile
@@ -63,8 +63,8 @@ spec = Gem::Specification.new do |s|
   s.rubyforge_project = "aws"
   s.homepage = "http://www.rubyonrails.org"
 
-  s.add_dependency('actionpack', '= 1.10.0' + PKG_BUILD)
-  s.add_dependency('activerecord', '= 1.12.0' + PKG_BUILD)
+  s.add_dependency('actionpack', '= 1.10.1' + PKG_BUILD)
+  s.add_dependency('activerecord', '= 1.12.1' + PKG_BUILD)
   s.add_dependency('activesupport', '= 1.2.0' + PKG_BUILD)
 
   s.has_rdoc = true
diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG
index 05743e9f4f..ec73763324 100644
--- a/activerecord/CHANGELOG
+++ b/activerecord/CHANGELOG
@@ -1,4 +1,4 @@
-*1.12.1*
+*1.12.1* (October 19th, 2005)
 
 * Always parenthesize :conditions options so they may be safely combined with STI and constraints.
 
@@ -6,6 +6,7 @@
 
 * Added support for using limits in eager loads that involve has_many and has_and_belongs_to_many associations
 
+
 *1.12.0* (October 16th, 2005)
 
 * Update/clean up documentation (rdoc)
diff --git a/activerecord/lib/active_record/version.rb b/activerecord/lib/active_record/version.rb
index beecbf445f..5fc3de2cd2 100644
--- a/activerecord/lib/active_record/version.rb
+++ b/activerecord/lib/active_record/version.rb
@@ -2,7 +2,7 @@ module ActiveRecord
   module Version #:nodoc:
     MAJOR = 1
     MINOR = 12
-    TINY  = 0
+    TINY  = 1
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end
diff --git a/railties/CHANGELOG b/railties/CHANGELOG
index e0d3b5df58..a11e96d097 100644
--- a/railties/CHANGELOG
+++ b/railties/CHANGELOG
@@ -1,5 +1,9 @@
+*0.14.1* (October 19th, 2005)
+
 * Remove trailing '/' from RAILS_ROOT [Nicholas Seckar]
 
+* Upgraded to Active Record 1.12.1 and Action Pack 1.10.1
+
 
 *0.14.0* (October 16th, 2005)
 
diff --git a/railties/Rakefile b/railties/Rakefile
index 9f9dfbe31a..c9b0dd217e 100644
--- a/railties/Rakefile
+++ b/railties/Rakefile
@@ -274,8 +274,8 @@ spec = Gem::Specification.new do |s|
 
   s.add_dependency('rake', '>= 0.6.2')
   s.add_dependency('activesupport',    '= 1.2.0' + PKG_BUILD)
-  s.add_dependency('activerecord',     '= 1.12.0' + PKG_BUILD)
-  s.add_dependency('actionpack',       '= 1.10.0' + PKG_BUILD)
+  s.add_dependency('activerecord',     '= 1.12.1' + PKG_BUILD)
+  s.add_dependency('actionpack',       '= 1.10.1' + PKG_BUILD)
   s.add_dependency('actionmailer',     '= 1.1.0' + PKG_BUILD)
   s.add_dependency('actionwebservice', '= 0.9.0' + PKG_BUILD)