aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2007-12-16 23:30:30 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2007-12-16 23:30:30 +0000
commit69edebf0f1f66581e9dc9fd92e7ad9b617ad8f31 (patch)
treecca1a234c098eba6a30e127f9946cfa877db5862 /activerecord
parent1427a49dc987952c0b30bb9025ab5284d73c8fe6 (diff)
downloadrails-69edebf0f1f66581e9dc9fd92e7ad9b617ad8f31.tar.gz
rails-69edebf0f1f66581e9dc9fd92e7ad9b617ad8f31.tar.bz2
rails-69edebf0f1f66581e9dc9fd92e7ad9b617ad8f31.zip
Prepare for 2.0.2 release
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8419 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord')
-rw-r--r--activerecord/CHANGELOG2
-rwxr-xr-xactiverecord/Rakefile2
-rw-r--r--activerecord/lib/active_record/version.rb2
3 files changed, 3 insertions, 3 deletions
diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG
index b168b07600..fe44b1b6d3 100644
--- a/activerecord/CHANGELOG
+++ b/activerecord/CHANGELOG
@@ -1,4 +1,4 @@
-*SVN*
+*2.0.2* (December 16th, 2007)
* Ensure optimistic locking handles nil #lock_version values properly. Closes #10510 [rick]
diff --git a/activerecord/Rakefile b/activerecord/Rakefile
index 54d03afc64..c22934e180 100755
--- a/activerecord/Rakefile
+++ b/activerecord/Rakefile
@@ -172,7 +172,7 @@ spec = Gem::Specification.new do |s|
s.files = s.files + Dir.glob( "#{dir}/**/*" ).delete_if { |item| item.include?( "\.svn" ) }
end
- s.add_dependency('activesupport', '= 2.0.1' + PKG_BUILD)
+ s.add_dependency('activesupport', '= 2.0.2' + PKG_BUILD)
s.files.delete "test/fixtures/fixture_database.sqlite"
s.files.delete "test/fixtures/fixture_database_2.sqlite"
diff --git a/activerecord/lib/active_record/version.rb b/activerecord/lib/active_record/version.rb
index 41b234f054..a8ee7dbeb9 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 = 2
MINOR = 0
- TINY = 1
+ TINY = 2
STRING = [MAJOR, MINOR, TINY].join('.')
end