merge revision(s) 33189:

	* test/rubygems/test_gem_security.rb
	  (test_class_build_self_signed_cert): reset opt[:trust_dir] to apply
	  temporary Gem.user_home.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@33190 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 9 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index d8cb1a9fa2..b646e30e30 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Mon Sep  5 15:06:55 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* test/rubygems/test_gem_security.rb
+	  (test_class_build_self_signed_cert): reset opt[:trust_dir] to apply
+	  temporary Gem.user_home.
+
 Sun Sep  4 00:56:58 2011  Kazuki Tsujimoto  <kazuki@callcc.net>
 
 	* backport r33177 from trunk.
diff --git a/test/rubygems/test_gem_security.rb b/test/rubygems/test_gem_security.rb
index df3168dce4..7f1b2e6ee3 100644
--- a/test/rubygems/test_gem_security.rb
+++ b/test/rubygems/test_gem_security.rb
@@ -43,6 +43,7 @@ class TestGemSecurity < Gem::TestCase
       :key_size  => 512,
       :save_cert => false,
       :save_key  => false,
+      :trust_dir => File.join(Gem.user_home, '.gem', 'trust'),
     }
 
     result = Gem::Security.build_self_signed_cert email, opt
diff --git a/version.h b/version.h
index 04b937dab7..b6648b1746 100644
--- a/version.h
+++ b/version.h
@@ -1,10 +1,10 @@
 #define RUBY_VERSION "1.9.3"
 #define RUBY_PATCHLEVEL -1
 
-#define RUBY_RELEASE_DATE "2011-09-04"
+#define RUBY_RELEASE_DATE "2011-09-05"
 #define RUBY_RELEASE_YEAR 2011
 #define RUBY_RELEASE_MONTH 9
-#define RUBY_RELEASE_DAY 4
+#define RUBY_RELEASE_DAY 5
 
 #include "ruby/version.h"