aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2006-04-09 21:27:32 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2006-04-09 21:27:32 +0000
commit00050dfedb8976741dbe998e4abc2281fa855c76 (patch)
tree47df984f36f0b2f79d4c6292df06f867e2a8cd95
parent4d078c87f4a1fee5ecdcb2010a6c85a70fd6ced0 (diff)
downloadrails-00050dfedb8976741dbe998e4abc2281fa855c76.tar.gz
rails-00050dfedb8976741dbe998e4abc2281fa855c76.tar.bz2
rails-00050dfedb8976741dbe998e4abc2281fa855c76.zip
Include the calculations fix for a new release of AR
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4203 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
-rw-r--r--actionwebservice/CHANGELOG5
-rw-r--r--actionwebservice/Rakefile2
-rw-r--r--actionwebservice/lib/action_web_service/version.rb2
-rw-r--r--activerecord/CHANGELOG5
-rw-r--r--activerecord/lib/active_record/version.rb2
-rw-r--r--railties/Rakefile4
6 files changed, 15 insertions, 5 deletions
diff --git a/actionwebservice/CHANGELOG b/actionwebservice/CHANGELOG
index 4245521e27..dd39728c01 100644
--- a/actionwebservice/CHANGELOG
+++ b/actionwebservice/CHANGELOG
@@ -1,3 +1,8 @@
+*1.1.2* (April 9th, 2005)
+
+* Rely on Active Record 1.14.2
+
+
*1.1.1* (April 6th, 2005)
* Do not convert driver options to strings (#4499)
diff --git a/actionwebservice/Rakefile b/actionwebservice/Rakefile
index 243065b025..1ca4a731ff 100644
--- a/actionwebservice/Rakefile
+++ b/actionwebservice/Rakefile
@@ -72,7 +72,7 @@ spec = Gem::Specification.new do |s|
s.homepage = "http://www.rubyonrails.org"
s.add_dependency('actionpack', '= 1.12.1' + PKG_BUILD)
- s.add_dependency('activerecord', '= 1.14.1' + PKG_BUILD)
+ s.add_dependency('activerecord', '= 1.14.2' + PKG_BUILD)
s.has_rdoc = true
s.requirements << 'none'
diff --git a/actionwebservice/lib/action_web_service/version.rb b/actionwebservice/lib/action_web_service/version.rb
index 0759e1d89a..aa2a4586f3 100644
--- a/actionwebservice/lib/action_web_service/version.rb
+++ b/actionwebservice/lib/action_web_service/version.rb
@@ -2,7 +2,7 @@ module ActionWebService
module VERSION #:nodoc:
MAJOR = 1
MINOR = 1
- TINY = 1
+ TINY = 2
STRING = [MAJOR, MINOR, TINY].join('.')
end
diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG
index 672a0f4f05..07aa0921d4 100644
--- a/activerecord/CHANGELOG
+++ b/activerecord/CHANGELOG
@@ -1,3 +1,8 @@
+*1.14.2* (April 9th, 2005)
+
+* Fixed calculations for the Oracle Adapter (closes #4626) [Michael Schoen]
+
+
*1.14.1* (April 6th, 2005)
* Fix type_name_with_module to handle type names that begin with '::'. Closes #4614. [Nicholas Seckar]
diff --git a/activerecord/lib/active_record/version.rb b/activerecord/lib/active_record/version.rb
index a8bf50c0f3..3158040d47 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 = 14
- TINY = 1
+ TINY = 2
STRING = [MAJOR, MINOR, TINY].join('.')
end
diff --git a/railties/Rakefile b/railties/Rakefile
index db08f964b6..926bb37eaf 100644
--- a/railties/Rakefile
+++ b/railties/Rakefile
@@ -279,10 +279,10 @@ spec = Gem::Specification.new do |s|
s.add_dependency('rake', '>= 0.7.1')
s.add_dependency('activesupport', '= 1.3.1' + PKG_BUILD)
- s.add_dependency('activerecord', '= 1.14.1' + PKG_BUILD)
+ s.add_dependency('activerecord', '= 1.14.2' + PKG_BUILD)
s.add_dependency('actionpack', '= 1.12.1' + PKG_BUILD)
s.add_dependency('actionmailer', '= 1.2.1' + PKG_BUILD)
- s.add_dependency('actionwebservice', '= 1.1.1' + PKG_BUILD)
+ s.add_dependency('actionwebservice', '= 1.1.2' + PKG_BUILD)
s.rdoc_options << '--exclude' << '.'
s.has_rdoc = false