ruby-changes:29889
From: nagachika <ko1@a...>
Date: Sat, 13 Jul 2013 22:42:25 +0900 (JST)
Subject: [ruby-changes:29889] nagachika:r41941 (ruby_2_0_0): merge revision(s) 41807:
nagachika 2013-07-13 22:42:11 +0900 (Sat, 13 Jul 2013) New Revision: 41941 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=41941 Log: merge revision(s) 41807: * test/openssl/test_x509crl.rb: Remove unused variable. [ruby-core:53501] [Bug #8114] Thanks, Vipul Amler, for pointing this out! Modified directories: branches/ruby_2_0_0/ Modified files: branches/ruby_2_0_0/ChangeLog branches/ruby_2_0_0/test/openssl/test_x509crl.rb branches/ruby_2_0_0/version.h Index: ruby_2_0_0/ChangeLog =================================================================== --- ruby_2_0_0/ChangeLog (revision 41940) +++ ruby_2_0_0/ChangeLog (revision 41941) @@ -1,3 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ChangeLog#L1 +Sat Jul 13 22:41:20 2013 Martin Bosslet <Martin.Bosslet@g...> + + * test/openssl/test_x509crl.rb: Remove unused variable. + [ruby-core:53501] [Bug #8114] + + Thanks, Vipul Amler, for pointing this out! + Sun Jul 7 02:00:41 2013 Martin Bosslet <Martin.Bosslet@g...> * lib/openssl/ssl.rb: Fix SSL client connection crash for SAN marked Index: ruby_2_0_0/version.h =================================================================== --- ruby_2_0_0/version.h (revision 41940) +++ ruby_2_0_0/version.h (revision 41941) @@ -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-07-07" -#define RUBY_PATCHLEVEL 255 +#define RUBY_RELEASE_DATE "2013-07-13" +#define RUBY_PATCHLEVEL 256 #define RUBY_RELEASE_YEAR 2013 #define RUBY_RELEASE_MONTH 7 -#define RUBY_RELEASE_DAY 7 +#define RUBY_RELEASE_DAY 13 #include "ruby/version.h" Index: ruby_2_0_0/test/openssl/test_x509crl.rb =================================================================== --- ruby_2_0_0/test/openssl/test_x509crl.rb (revision 41940) +++ ruby_2_0_0/test/openssl/test_x509crl.rb (revision 41941) @@ -101,7 +101,6 @@ class OpenSSL::TestX509CRL < Test::Unit: https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/test/openssl/test_x509crl.rb#L101 assert_equal(false, revoked[3].extensions[0].critical?) assert_equal(false, revoked[4].extensions[0].critical?) - crl = OpenSSL::X509::CRL.new(crl.to_der) assert_equal("Key Compromise", revoked[0].extensions[0].value) assert_equal("CA Compromise", revoked[1].extensions[0].value) assert_equal("Affiliation Changed", revoked[2].extensions[0].value) Property changes on: ruby_2_0_0 ___________________________________________________________________ Modified: svn:mergeinfo Merged /trunk:r41807 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/