From 57c31a380e0136607f3ce6ee568730ec1539e163 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@loudthinking.com>
Date: Thu, 23 Oct 2008 20:14:20 +0200
Subject: Prepare for Rails 2.2.0 [RC1]

---
 activeresource/CHANGELOG | 2 +-
 activeresource/Rakefile  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'activeresource')

diff --git a/activeresource/CHANGELOG b/activeresource/CHANGELOG
index e93b3ec15b..bb9a39a865 100644
--- a/activeresource/CHANGELOG
+++ b/activeresource/CHANGELOG
@@ -1,4 +1,4 @@
-*Edge*
+*2.2.0 [RC1] (October 23rd, 2008)*
 
 * Add ActiveResource::Base#to_xml and ActiveResource::Base#to_json. #1011 [Rasik Pandey, Cody Fauser]
 
diff --git a/activeresource/Rakefile b/activeresource/Rakefile
index 8c3ad36a02..51559fa6f8 100644
--- a/activeresource/Rakefile
+++ b/activeresource/Rakefile
@@ -65,7 +65,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.1.0' + PKG_BUILD)
+  s.add_dependency('activesupport', '= 2.2.0' + PKG_BUILD)
 
   s.require_path = 'lib'
   s.autorequire = 'active_resource'
-- 
cgit v1.2.3


From eec6e0cbbddcc9bf141387536d4b910cc0df9d4d Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@loudthinking.com>
Date: Thu, 23 Oct 2008 20:18:11 +0200
Subject: Push to new gem server

---
 activeresource/Rakefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'activeresource')

diff --git a/activeresource/Rakefile b/activeresource/Rakefile
index 51559fa6f8..a35864ad0f 100644
--- a/activeresource/Rakefile
+++ b/activeresource/Rakefile
@@ -115,8 +115,8 @@ end
 
 desc "Publish the beta gem"
 task :pgem => [:package] do 
-  Rake::SshFilePublisher.new("wrath.rubyonrails.org", "public_html/gems/gems", "pkg", "#{PKG_FILE_NAME}.gem").upload
-  `ssh wrath.rubyonrails.org './gemupdate.sh'`
+  Rake::SshFilePublisher.new("gems.rubyonrails.org", "/u/sites/gems/gems", "pkg", "#{PKG_FILE_NAME}.gem").upload
+  `ssh gems.rubyonrails.org './gemupdate.sh'`
 end
 
 desc "Publish the API documentation"
-- 
cgit v1.2.3


From ca7e4d71c276d779ce15439361f8112c9d22e5a2 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@loudthinking.com>
Date: Thu, 23 Oct 2008 20:23:01 +0200
Subject: Should be 2.2.0 as well

---
 activeresource/lib/active_resource/version.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'activeresource')

diff --git a/activeresource/lib/active_resource/version.rb b/activeresource/lib/active_resource/version.rb
index 88798ea1c1..d56f4cf17e 100644
--- a/activeresource/lib/active_resource/version.rb
+++ b/activeresource/lib/active_resource/version.rb
@@ -1,7 +1,7 @@
 module ActiveResource
   module VERSION #:nodoc:
     MAJOR = 2
-    MINOR = 1
+    MINOR = 2
     TINY  = 0
 
     STRING = [MAJOR, MINOR, TINY].join('.')
-- 
cgit v1.2.3


From 5366e61458cb642429a80297abefddcda6696abe Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@loudthinking.com>
Date: Thu, 23 Oct 2008 20:29:25 +0200
Subject: Proper update call for gem server

---
 activeresource/Rakefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'activeresource')

diff --git a/activeresource/Rakefile b/activeresource/Rakefile
index a35864ad0f..ef6efd4903 100644
--- a/activeresource/Rakefile
+++ b/activeresource/Rakefile
@@ -116,7 +116,7 @@ end
 desc "Publish the beta gem"
 task :pgem => [:package] do 
   Rake::SshFilePublisher.new("gems.rubyonrails.org", "/u/sites/gems/gems", "pkg", "#{PKG_FILE_NAME}.gem").upload
-  `ssh gems.rubyonrails.org './gemupdate.sh'`
+  `ssh gems.rubyonrails.org '/u/sites/gems/gemupdate.sh'`
 end
 
 desc "Publish the API documentation"
-- 
cgit v1.2.3


From d224e6ccb131559190f35c8ddfc9b31274ac5a89 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@loudthinking.com>
Date: Fri, 24 Oct 2008 13:08:47 +0200
Subject: Update CHANGELOGs with the last few fixes, set date for today

---
 activeresource/CHANGELOG | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'activeresource')

diff --git a/activeresource/CHANGELOG b/activeresource/CHANGELOG
index bb9a39a865..74ca71f65a 100644
--- a/activeresource/CHANGELOG
+++ b/activeresource/CHANGELOG
@@ -1,4 +1,4 @@
-*2.2.0 [RC1] (October 23rd, 2008)*
+*2.2.0 [RC1] (October 24th, 2008)*
 
 * Add ActiveResource::Base#to_xml and ActiveResource::Base#to_json. #1011 [Rasik Pandey, Cody Fauser]
 
-- 
cgit v1.2.3