nagachika	2013-04-03 04:56:46 +0900 (Wed, 03 Apr 2013)

  New Revision: 40074

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=40074

  Log:
    merge revision(s) 40048:
    
    fix typo: s/@ca_cert/@cacert/

  Modified directories:
    branches/ruby_2_0_0/
  Modified files:
    branches/ruby_2_0_0/test/openssl/test_pkcs12.rb
    branches/ruby_2_0_0/version.h

Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 40073)
+++ ruby_2_0_0/version.h	(revision 40074)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/version.h#L1
 #define RUBY_VERSION "2.0.0"
-#define RUBY_RELEASE_DATE "2013-03-27"
-#define RUBY_PATCHLEVEL 100
+#define RUBY_RELEASE_DATE "2013-04-03"
+#define RUBY_PATCHLEVEL 101
 
 #define RUBY_RELEASE_YEAR 2013
-#define RUBY_RELEASE_MONTH 3
-#define RUBY_RELEASE_DAY 27
+#define RUBY_RELEASE_MONTH 4
+#define RUBY_RELEASE_DAY 3
 
 #include "ruby/version.h"
 
Index: ruby_2_0_0/test/openssl/test_pkcs12.rb
===================================================================
--- ruby_2_0_0/test/openssl/test_pkcs12.rb	(revision 40073)
+++ ruby_2_0_0/test/openssl/test_pkcs12.rb	(revision 40074)
@@ -40,7 +40,7 @@ Li8JsX5yIiuVYaBg/6ha3tOg4TCa5K/3r3tVliRZ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/test/openssl/test_pkcs12.rb#L40
       _EOS_
 
       @inter_cacert = issue_cert(inter_ca, inter_ca_key, 2, now, now+3600, ca_exts,
-                                 @ca_cert, TEST_KEY_RSA2048, OpenSSL::Digest::SHA1.new)
+                                 @cacert, TEST_KEY_RSA2048, OpenSSL::Digest::SHA1.new)
 
       exts = [
         ["keyUsage","digitalSignature",true],

Property changes on: ruby_2_0_0
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r40048


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/