aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
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 /activerecord
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
Diffstat (limited to 'activerecord')
-rw-r--r--activerecord/CHANGELOG5
-rw-r--r--activerecord/lib/active_record/version.rb2
2 files changed, 6 insertions, 1 deletions
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