summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authordrbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-04-20 03:38:54 +0000
committerdrbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-04-20 03:38:54 +0000
commiteaa1fccf1dbb92a78b5e4398f5f34659d58a1662 (patch)
treeb5ef0911304d4ff4c058b9b0edd46bcdac35abbc /ChangeLog
parent1abf777e3f98a10f8568206b7879212670e4451d (diff)
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
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog9
1 files changed, 9 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 5f58060cf1..fb7448fcf8 100644
--- 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