Merge branch 'hotfix/1.8.7_and_1.9.3_SSL_fix' into stable

funny-falcon · Feb 16, 2012 · 1b9abac · 1b9abac
2 parents 1d45e89 + de61dbe
commit 1b9abac
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/config/db b/config/db
@@ -19,10 +19,10 @@ ruby_1.7_url=http://ftp.ruby-lang.org/pub/ruby/1.7
 ruby_1.8_url=http://ftp.ruby-lang.org/pub/ruby/1.8
 ruby_1.9_url=http://ftp.ruby-lang.org/pub/ruby/1.9
 ruby_2.0_url=http://ftp.ruby-lang.org/pub/ruby/2.0
-ruby_1.9.3_patch_level=0
+ruby_1.9.3_patch_level=125
 ruby_1.9.2_patch_level=290
 ruby_1.9.1_patch_level=431
-ruby_1.8.7_patch_level=357
+ruby_1.8.7_patch_level=358
 ruby_1.8.6_patch_level=420
 ruby_1.8.5_patch_level=231
 rubygems_url=http://production.cf.rubygems.org/rubygems

diff --git a/config/known b/config/known
@@ -1,17 +1,15 @@
 # MRI Rubies
 [ruby-]1.8.6[-p420]
-[ruby-]1.8.6-head
-[ruby-]1.8.7[-p357]
+[ruby-]1.8.7[-p358]
 [ruby-]1.8.7-head
-[ruby-]1.9.1-p378
 [ruby-]1.9.1[-p431]
-[ruby-]1.9.1-head
 [ruby-]1.9.2-p180
 [ruby-]1.9.2[-p290]
 [ruby-]1.9.2-head
 [ruby-]1.9.3-preview1
 [ruby-]1.9.3-rc1
-[ruby-]1.9.3[-p0]
+[ruby-]1.9.3-p0
+[ruby-]1.9.3[-p125]
 [ruby-]1.9.3-head
 ruby-head
 
@@ -31,7 +29,7 @@ jruby-1.6.3
 jruby-1.6.4
 jruby-1.6.5
 jruby-1.6.5.1
-jruby-[1.6.6]
+jruby[-1.6.6]
 jruby-head
 
 # Rubinius