From 00050dfedb8976741dbe998e4abc2281fa855c76 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@loudthinking.com>
Date: Sun, 9 Apr 2006 21:27:32 +0000
Subject: 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
---
 actionwebservice/CHANGELOG                         | 5 +++++
 actionwebservice/Rakefile                          | 2 +-
 actionwebservice/lib/action_web_service/version.rb | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

(limited to 'actionwebservice')

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
-- 
cgit v1.2.3