diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2008-11-14 17:41:25 +0530 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2008-11-14 17:41:25 +0530 |
| commit | 17b1387646a9537c978e9d7c5f3a68f740cd9377 (patch) | |
| tree | 81735b97603471bb9780ed0fd133dad7a16f59a7 /activeresource | |
| parent | fa9ea057d1252a578f8e056defef41b93853bc8b (diff) | |
| parent | 549b18c9286b6cccf4978093576325fd711dc421 (diff) | |
| download | rails-17b1387646a9537c978e9d7c5f3a68f740cd9377.tar.gz rails-17b1387646a9537c978e9d7c5f3a68f740cd9377.tar.bz2 rails-17b1387646a9537c978e9d7c5f3a68f740cd9377.zip | |
Merge commit 'mainstream/master'
Conflicts:
railties/doc/guides/html/actioncontroller_basics.html
railties/doc/guides/html/activerecord_validations_callbacks.html
railties/doc/guides/html/debugging_rails_applications.html
railties/doc/guides/html/testing_rails_applications.html
railties/doc/guides/source/actioncontroller_basics/methods.txt
railties/doc/guides/source/actioncontroller_basics/params.txt
railties/doc/guides/source/actioncontroller_basics/request_response_objects.txt
railties/doc/guides/source/actioncontroller_basics/session.txt
railties/doc/guides/source/activerecord_validations_callbacks.txt
railties/doc/guides/source/debugging_rails_applications.txt
railties/doc/guides/source/testing_rails_applications.txt
Diffstat (limited to 'activeresource')
| -rw-r--r-- | activeresource/CHANGELOG | 2 | ||||
| -rw-r--r-- | activeresource/lib/active_resource/version.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/activeresource/CHANGELOG b/activeresource/CHANGELOG index 114a63c415..e05a634a12 100644 --- a/activeresource/CHANGELOG +++ b/activeresource/CHANGELOG @@ -1,4 +1,4 @@ -*2.2.1 [RC2 or 2.2 final]* +*2.2.1 [RC2] (November 14th, 2008)* * Fixed that ActiveResource#post would post an empty string when it shouldn't be posting anything #525 [Paolo Angelini] diff --git a/activeresource/lib/active_resource/version.rb b/activeresource/lib/active_resource/version.rb index d56f4cf17e..3747ffc63c 100644 --- a/activeresource/lib/active_resource/version.rb +++ b/activeresource/lib/active_resource/version.rb @@ -2,7 +2,7 @@ module ActiveResource module VERSION #:nodoc: MAJOR = 2 MINOR = 2 - TINY = 0 + TINY = 1 STRING = [MAJOR, MINOR, TINY].join('.') end |