Merged r35411 from trunk:

* lib/rubygems/ssl_certs/AddTrustExternalCARoot.pem: Removed to avoid conflict with ca-bundle.pem * lib/rubygems/ssl_certs/VerisignClass3PublicPrimaryCertificationAuthority-G2.pem: ditto. * lib/rubygems/ssl_certs/Entrust_net-Secure-Server-Certification-Authority.pem: ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@35412 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
headius · Apr 20, 2012 · eaa1fcc · eaa1fcc
1 parent 1abf777
commit eaa1fcc
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 238 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,12 @@
+Fri Apr 20 12:30:06 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/ssl_certs/AddTrustExternalCARoot.pem:  Removed to avoid
+	  conflict with ca-bundle.pem
+	* lib/rubygems/ssl_certs/VerisignClass3PublicPrimaryCertificationAuthority-G2.pem:
+	  ditto.
+	* lib/rubygems/ssl_certs/Entrust_net-Secure-Server-Certification-Authority.pem:
+	  ditto.
+
 Fri Apr 20 08:30:55 2012  Eric Hodel  <drbrain@segment7.net>
 
 	* lib/rubygems:  Update to RubyGems 1.8.23 which contains security

diff --git a/lib/rubygems/ssl_certs/AddTrustExternalCARoot.pem b/lib/rubygems/ssl_certs/AddTrustExternalCARoot.pem
diff --git a/lib/rubygems/ssl_certs/Entrust_net-Secure-Server-Certification-Authority.pem b/lib/rubygems/ssl_certs/Entrust_net-Secure-Server-Certification-Authority.pem
diff --git a/lib/rubygems/ssl_certs/VerisignClass3PublicPrimaryCertificationAuthority-G2.pem b/lib/rubygems/ssl_certs/VerisignClass3PublicPrimaryCertificationAuthority-G2.pem
diff --git a/version.h b/version.h
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 194
+#define RUBY_PATCHLEVEL 195
 
 #define RUBY_RELEASE_DATE "2012-04-20"
 #define RUBY_RELEASE_YEAR 2012