Skip to content

Commit eaa1fcc

Browse files
committed
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
1 parent 1abf777 commit eaa1fcc

File tree

5 files changed

+10
-238
lines changed

5 files changed

+10
-238
lines changed

ChangeLog

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
Fri Apr 20 12:30:06 2012 Eric Hodel <drbrain@segment7.net>
2+
3+
* lib/rubygems/ssl_certs/AddTrustExternalCARoot.pem: Removed to avoid
4+
conflict with ca-bundle.pem
5+
* lib/rubygems/ssl_certs/VerisignClass3PublicPrimaryCertificationAuthority-G2.pem:
6+
ditto.
7+
* lib/rubygems/ssl_certs/Entrust_net-Secure-Server-Certification-Authority.pem:
8+
ditto.
9+
110
Fri Apr 20 08:30:55 2012 Eric Hodel <drbrain@segment7.net>
211

312
* lib/rubygems: Update to RubyGems 1.8.23 which contains security

lib/rubygems/ssl_certs/AddTrustExternalCARoot.pem

Lines changed: 0 additions & 90 deletions
This file was deleted.

lib/rubygems/ssl_certs/Entrust_net-Secure-Server-Certification-Authority.pem

Lines changed: 0 additions & 90 deletions
This file was deleted.

lib/rubygems/ssl_certs/VerisignClass3PublicPrimaryCertificationAuthority-G2.pem

Lines changed: 0 additions & 57 deletions
This file was deleted.

version.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#define RUBY_VERSION "1.9.3"
2-
#define RUBY_PATCHLEVEL 194
2+
#define RUBY_PATCHLEVEL 195
33

44
#define RUBY_RELEASE_DATE "2012-04-20"
55
#define RUBY_RELEASE_YEAR 2012

0 commit comments

Comments
 (0)