diff options
| author | rick <technoweenie@gmail.com> | 2008-05-31 17:15:24 -0700 |
|---|---|---|
| committer | rick <technoweenie@gmail.com> | 2008-05-31 17:15:24 -0700 |
| commit | 6a975d6ca28216cfa015374c802279349e9253ca (patch) | |
| tree | e0a73c68e00755993f2bac86115f178656637c93 /activeresource | |
| parent | 72483c0d4c1e4ea794919974100acc2f255f6fd2 (diff) | |
| parent | ea03b0885c110003496c1f99dc7d9d2f1534955b (diff) | |
| download | rails-6a975d6ca28216cfa015374c802279349e9253ca.tar.gz rails-6a975d6ca28216cfa015374c802279349e9253ca.tar.bz2 rails-6a975d6ca28216cfa015374c802279349e9253ca.zip | |
fix changelog conflict
Diffstat (limited to 'activeresource')
| -rw-r--r-- | activeresource/CHANGELOG | 2 | ||||
| -rw-r--r-- | activeresource/Rakefile | 2 | ||||
| -rw-r--r-- | activeresource/lib/active_resource/version.rb | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/activeresource/CHANGELOG b/activeresource/CHANGELOG index 9aa7d455a2..e124e40dd1 100644 --- a/activeresource/CHANGELOG +++ b/activeresource/CHANGELOG @@ -1,4 +1,4 @@ -*2.1.0 RC1 (May 11th, 2008)* +*2.1.0 (May 31st, 2008)* * Fixed response logging to use length instead of the entire thing (seangeo) [#27] diff --git a/activeresource/Rakefile b/activeresource/Rakefile index 75fe52aea8..9fd0ec4921 100644 --- a/activeresource/Rakefile +++ b/activeresource/Rakefile @@ -64,7 +64,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.991' + PKG_BUILD) + s.add_dependency('activesupport', '= 2.1.0' + PKG_BUILD) s.require_path = 'lib' s.autorequire = 'active_resource' diff --git a/activeresource/lib/active_resource/version.rb b/activeresource/lib/active_resource/version.rb index 34fb05b703..88798ea1c1 100644 --- a/activeresource/lib/active_resource/version.rb +++ b/activeresource/lib/active_resource/version.rb @@ -1,8 +1,8 @@ module ActiveResource module VERSION #:nodoc: MAJOR = 2 - MINOR = 0 - TINY = 991 + MINOR = 1 + TINY = 0 STRING = [MAJOR, MINOR, TINY].join('.') end |