Skip to content

Commit

Permalink
Merge branch 'hotfix/1.25.32' into stable
Browse files Browse the repository at this point in the history
  • Loading branch information
@mpapis
mpapis committed Sep 30, 2014
2 parents ba3636d + 9637014 commit 6e9e8a9
Show file tree
Hide file tree
Showing 44 changed files with 232 additions and 142 deletions.
2 changes: 1 addition & 1 deletion VERSION
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.25.31
1.25.32
2 changes: 1 addition & 1 deletion config/db
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ kiji_version=head
mruby_repo_url=git://github.com/mruby/mruby.git
mruby_url=https://github.com/mruby/mruby/archive
mruby_version=1.0.0
jruby_version=1.7.15
jruby_version=1.7.16
jruby_repo_url=git://github.com/jruby/jruby.git
jruby_url=http://jruby.org.s3.amazonaws.com/downloads
macruby_version=0.12
Expand Down
2 changes: 1 addition & 1 deletion config/known
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ mruby[-head]

# JRuby
jruby-1.6.8
jruby[-1.7.15]
jruby[-1.7.16]
jruby-head

# Rubinius
Expand Down
2 changes: 1 addition & 1 deletion config/known_strings
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# this strings are matched only when partial version was provided
jruby-1.5.6
jruby-1.6.8
jruby-1.7.15
jruby-1.7.16
rbx-1.3.3
rbx-2.0.0
rbx-2.1.1
Expand Down
37 changes: 37 additions & 0 deletions config/md5
View file

Large diffs are not rendered by default.

36 changes: 36 additions & 0 deletions config/remote
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,11 @@ https://rvm.io/binaries/centos/5/x86_64/ruby-2.0.0-p247.tar.bz2
https://rvm.io/binaries/centos/5/x86_64/ruby-2.0.0-p353.tar.bz2
https://rvm.io/binaries/centos/5/x86_64/ruby-2.0.0-p451.tar.bz2
https://rvm.io/binaries/centos/5/x86_64/ruby-2.0.0-p481.tar.bz2
https://rvm.io/binaries/centos/5/x86_64/ruby-2.0.0-p576.tar.bz2
https://rvm.io/binaries/centos/5/x86_64/ruby-2.1.0.tar.bz2
https://rvm.io/binaries/centos/5/x86_64/ruby-2.1.1.tar.bz2
https://rvm.io/binaries/centos/5/x86_64/ruby-2.1.2.tar.bz2
https://rvm.io/binaries/centos/5/x86_64/ruby-2.1.3.tar.bz2
https://rvm.io/binaries/centos/6/x86_64/ruby-1.9.3-p194.tar.bz2
https://rvm.io/binaries/centos/6/x86_64/ruby-1.9.3-p286.tar.bz2
https://rvm.io/binaries/centos/6/x86_64/ruby-1.9.3-p327.tar.bz2
Expand All @@ -39,8 +41,10 @@ https://rvm.io/binaries/centos/6/x86_64/ruby-2.0.0-p195.tar.bz2
https://rvm.io/binaries/centos/6/x86_64/ruby-2.0.0-p247.tar.bz2
https://rvm.io/binaries/centos/6/x86_64/ruby-2.0.0-p353.tar.bz2
https://rvm.io/binaries/centos/6/x86_64/ruby-2.0.0-p481.tar.bz2
https://rvm.io/binaries/centos/6/x86_64/ruby-2.0.0-p576.tar.bz2
https://rvm.io/binaries/centos/6/x86_64/ruby-2.1.0.tar.bz2
https://rvm.io/binaries/centos/6/x86_64/ruby-2.1.2.tar.bz2
https://rvm.io/binaries/centos/6/x86_64/ruby-2.1.3.tar.bz2
https://rvm.io/binaries/debian/6/i386/ruby-1.9.3-p429.tar.bz2
https://rvm.io/binaries/debian/6/i386/ruby-1.9.3-p448.tar.bz2
https://rvm.io/binaries/debian/6/i386/ruby-2.0.0-p195.tar.bz2
Expand Down Expand Up @@ -71,9 +75,11 @@ https://rvm.io/binaries/debian/7/i386/ruby-2.0.0-p247.tar.bz2
https://rvm.io/binaries/debian/7/i386/ruby-2.0.0-p353.tar.bz2
https://rvm.io/binaries/debian/7/i386/ruby-2.0.0-p451.tar.bz2
https://rvm.io/binaries/debian/7/i386/ruby-2.0.0-p481.tar.bz2
https://rvm.io/binaries/debian/7/i386/ruby-2.0.0-p576.tar.bz2
https://rvm.io/binaries/debian/7/i386/ruby-2.1.0.tar.bz2
https://rvm.io/binaries/debian/7/i386/ruby-2.1.1.tar.bz2
https://rvm.io/binaries/debian/7/i386/ruby-2.1.2.tar.bz2
https://rvm.io/binaries/debian/7/i386/ruby-2.1.3.tar.bz2
https://rvm.io/binaries/debian/7/x86_64/ruby-1.9.3-p194.tar.bz2
https://rvm.io/binaries/debian/7/x86_64/ruby-1.9.3-p286.tar.bz2
https://rvm.io/binaries/debian/7/x86_64/ruby-1.9.3-p374.tar.bz2
Expand All @@ -89,14 +95,18 @@ https://rvm.io/binaries/debian/7/x86_64/ruby-2.0.0-p247.tar.bz2
https://rvm.io/binaries/debian/7/x86_64/ruby-2.0.0-p353.tar.bz2
https://rvm.io/binaries/debian/7/x86_64/ruby-2.0.0-p451.tar.bz2
https://rvm.io/binaries/debian/7/x86_64/ruby-2.0.0-p481.tar.bz2
https://rvm.io/binaries/debian/7/x86_64/ruby-2.0.0-p576.tar.bz2
https://rvm.io/binaries/debian/7/x86_64/ruby-2.1.0.tar.bz2
https://rvm.io/binaries/debian/7/x86_64/ruby-2.1.1.tar.bz2
https://rvm.io/binaries/debian/7/x86_64/ruby-2.1.2.tar.bz2
https://rvm.io/binaries/debian/7/x86_64/ruby-2.1.3.tar.bz2
https://rvm.io/binaries/debian/jessie_sid/x86_64/ruby-1.9.3-p547.tar.bz2
https://rvm.io/binaries/debian/jessie_sid/x86_64/ruby-2.0.0-p353.tar.bz2
https://rvm.io/binaries/debian/jessie_sid/x86_64/ruby-2.0.0-p481.tar.bz2
https://rvm.io/binaries/debian/jessie_sid/x86_64/ruby-2.0.0-p576.tar.bz2
https://rvm.io/binaries/debian/jessie_sid/x86_64/ruby-2.1.0.tar.bz2
https://rvm.io/binaries/debian/jessie_sid/x86_64/ruby-2.1.2.tar.bz2
https://rvm.io/binaries/debian/jessie_sid/x86_64/ruby-2.1.3.tar.bz2
https://rvm.io/binaries/fedora/17/x86_64/ruby-1.9.3-p429.tar.bz2
https://rvm.io/binaries/fedora/17/x86_64/ruby-1.9.3-p448.tar.bz2
https://rvm.io/binaries/fedora/17/x86_64/ruby-2.0.0-p195.tar.bz2
Expand All @@ -116,12 +126,16 @@ https://rvm.io/binaries/fedora/19/x86_64/ruby-2.0.0-p247.tar.bz2
https://rvm.io/binaries/fedora/19/x86_64/ruby-2.0.0-p353.tar.bz2
https://rvm.io/binaries/fedora/19/x86_64/ruby-2.0.0-p451.tar.bz2
https://rvm.io/binaries/fedora/19/x86_64/ruby-2.0.0-p481.tar.bz2
https://rvm.io/binaries/fedora/19/x86_64/ruby-2.0.0-p576.tar.bz2
https://rvm.io/binaries/fedora/19/x86_64/ruby-2.1.0.tar.bz2
https://rvm.io/binaries/fedora/19/x86_64/ruby-2.1.1.tar.bz2
https://rvm.io/binaries/fedora/19/x86_64/ruby-2.1.2.tar.bz2
https://rvm.io/binaries/fedora/19/x86_64/ruby-2.1.3.tar.bz2
https://rvm.io/binaries/fedora/20/x86_64/ruby-1.9.3-p547.tar.bz2
https://rvm.io/binaries/fedora/20/x86_64/ruby-2.0.0-p481.tar.bz2
https://rvm.io/binaries/fedora/20/x86_64/ruby-2.0.0-p576.tar.bz2
https://rvm.io/binaries/fedora/20/x86_64/ruby-2.1.2.tar.bz2
https://rvm.io/binaries/fedora/20/x86_64/ruby-2.1.3.tar.bz2
https://rvm.io/binaries/opensuse/12.1/x86_64/ruby-1.9.3-p194.tar.bz2
https://rvm.io/binaries/opensuse/12.1/x86_64/ruby-1.9.3-p286.tar.bz2
https://rvm.io/binaries/opensuse/12.1/x86_64/ruby-1.9.3-p374.tar.bz2
Expand All @@ -147,9 +161,13 @@ https://rvm.io/binaries/opensuse/12.3/x86_64/ruby-2.0.0-p247.tar.bz2
https://rvm.io/binaries/opensuse/12.3/x86_64/ruby-2.0.0-p353.tar.bz2
https://rvm.io/binaries/opensuse/12.3/x86_64/ruby-2.0.0-p451.tar.bz2
https://rvm.io/binaries/opensuse/12.3/x86_64/ruby-2.0.0-p481.tar.bz2
https://rvm.io/binaries/opensuse/12.3/x86_64/ruby-2.0.0-p576.tar.bz2
https://rvm.io/binaries/opensuse/12.3/x86_64/ruby-2.1.0.tar.bz2
https://rvm.io/binaries/opensuse/12.3/x86_64/ruby-2.1.1.tar.bz2
https://rvm.io/binaries/opensuse/12.3/x86_64/ruby-2.1.2.tar.bz2
https://rvm.io/binaries/opensuse/12.3/x86_64/ruby-2.1.3.tar.bz2
https://rvm.io/binaries/opensuse/13.1/x86_64/ruby-2.0.0-p576.tar.bz2
https://rvm.io/binaries/opensuse/13.1/x86_64/ruby-2.1.3.tar.bz2
https://rvm.io/binaries/osx/10.10/x86_64/ruby-2.0.0-p451.tar.bz2
https://rvm.io/binaries/osx/10.10/x86_64/ruby-2.0.0-p481.tar.bz2
https://rvm.io/binaries/osx/10.10/x86_64/ruby-2.1.1.tar.bz2
Expand Down Expand Up @@ -183,9 +201,11 @@ https://rvm.io/binaries/ubuntu/10.04/i386/ruby-2.0.0-p247.tar.bz2
https://rvm.io/binaries/ubuntu/10.04/i386/ruby-2.0.0-p353.tar.bz2
https://rvm.io/binaries/ubuntu/10.04/i386/ruby-2.0.0-p451.tar.bz2
https://rvm.io/binaries/ubuntu/10.04/i386/ruby-2.0.0-p481.tar.bz2
https://rvm.io/binaries/ubuntu/10.04/i386/ruby-2.0.0-p576.tar.bz2
https://rvm.io/binaries/ubuntu/10.04/i386/ruby-2.1.0.tar.bz2
https://rvm.io/binaries/ubuntu/10.04/i386/ruby-2.1.1.tar.bz2
https://rvm.io/binaries/ubuntu/10.04/i386/ruby-2.1.2.tar.bz2
https://rvm.io/binaries/ubuntu/10.04/i386/ruby-2.1.3.tar.bz2
https://rvm.io/binaries/ubuntu/10.04/x86_64/ruby-1.9.3-p194.tar.bz2
https://rvm.io/binaries/ubuntu/10.04/x86_64/ruby-1.9.3-p286.tar.bz2
https://rvm.io/binaries/ubuntu/10.04/x86_64/ruby-1.9.3-p327.tar.bz2
Expand All @@ -203,9 +223,11 @@ https://rvm.io/binaries/ubuntu/10.04/x86_64/ruby-2.0.0-p247.tar.bz2
https://rvm.io/binaries/ubuntu/10.04/x86_64/ruby-2.0.0-p353.tar.bz2
https://rvm.io/binaries/ubuntu/10.04/x86_64/ruby-2.0.0-p451.tar.bz2
https://rvm.io/binaries/ubuntu/10.04/x86_64/ruby-2.0.0-p481.tar.bz2
https://rvm.io/binaries/ubuntu/10.04/x86_64/ruby-2.0.0-p576.tar.bz2
https://rvm.io/binaries/ubuntu/10.04/x86_64/ruby-2.1.0.tar.bz2
https://rvm.io/binaries/ubuntu/10.04/x86_64/ruby-2.1.1.tar.bz2
https://rvm.io/binaries/ubuntu/10.04/x86_64/ruby-2.1.2.tar.bz2
https://rvm.io/binaries/ubuntu/10.04/x86_64/ruby-2.1.3.tar.bz2
https://rvm.io/binaries/ubuntu/11.10/x86_64/ruby-1.9.3-p194.tar.bz2
https://rvm.io/binaries/ubuntu/11.10/x86_64/ruby-1.9.3-p286.tar.bz2
https://rvm.io/binaries/ubuntu/11.10/x86_64/ruby-1.9.3-p327.tar.bz2
Expand All @@ -230,9 +252,11 @@ https://rvm.io/binaries/ubuntu/12.04/i386/ruby-2.0.0-p247.tar.bz2
https://rvm.io/binaries/ubuntu/12.04/i386/ruby-2.0.0-p353.tar.bz2
https://rvm.io/binaries/ubuntu/12.04/i386/ruby-2.0.0-p451.tar.bz2
https://rvm.io/binaries/ubuntu/12.04/i386/ruby-2.0.0-p481.tar.bz2
https://rvm.io/binaries/ubuntu/12.04/i386/ruby-2.0.0-p576.tar.bz2
https://rvm.io/binaries/ubuntu/12.04/i386/ruby-2.1.0.tar.bz2
https://rvm.io/binaries/ubuntu/12.04/i386/ruby-2.1.1.tar.bz2
https://rvm.io/binaries/ubuntu/12.04/i386/ruby-2.1.2.tar.bz2
https://rvm.io/binaries/ubuntu/12.04/i386/ruby-2.1.3.tar.bz2
https://rvm.io/binaries/ubuntu/12.04/x86_64/ruby-1.9.3-p194.tar.bz2
https://rvm.io/binaries/ubuntu/12.04/x86_64/ruby-1.9.3-p286.tar.bz2
https://rvm.io/binaries/ubuntu/12.04/x86_64/ruby-1.9.3-p327.tar.bz2
Expand All @@ -248,8 +272,10 @@ https://rvm.io/binaries/ubuntu/12.04/x86_64/ruby-2.0.0-p195.tar.bz2
https://rvm.io/binaries/ubuntu/12.04/x86_64/ruby-2.0.0-p247.tar.bz2
https://rvm.io/binaries/ubuntu/12.04/x86_64/ruby-2.0.0-p353.tar.bz2
https://rvm.io/binaries/ubuntu/12.04/x86_64/ruby-2.0.0-p481.tar.bz2
https://rvm.io/binaries/ubuntu/12.04/x86_64/ruby-2.0.0-p576.tar.bz2
https://rvm.io/binaries/ubuntu/12.04/x86_64/ruby-2.1.0.tar.bz2
https://rvm.io/binaries/ubuntu/12.04/x86_64/ruby-2.1.2.tar.bz2
https://rvm.io/binaries/ubuntu/12.04/x86_64/ruby-2.1.3.tar.bz2
https://rvm.io/binaries/ubuntu/12.10/x86_64/ruby-1.9.3-p194.tar.bz2
https://rvm.io/binaries/ubuntu/12.10/x86_64/ruby-1.9.3-p286.tar.bz2
https://rvm.io/binaries/ubuntu/12.10/x86_64/ruby-1.9.3-p327.tar.bz2
Expand All @@ -267,9 +293,11 @@ https://rvm.io/binaries/ubuntu/12.10/x86_64/ruby-2.0.0-p247.tar.bz2
https://rvm.io/binaries/ubuntu/12.10/x86_64/ruby-2.0.0-p353.tar.bz2
https://rvm.io/binaries/ubuntu/12.10/x86_64/ruby-2.0.0-p451.tar.bz2
https://rvm.io/binaries/ubuntu/12.10/x86_64/ruby-2.0.0-p481.tar.bz2
https://rvm.io/binaries/ubuntu/12.10/x86_64/ruby-2.0.0-p576.tar.bz2
https://rvm.io/binaries/ubuntu/12.10/x86_64/ruby-2.1.0.tar.bz2
https://rvm.io/binaries/ubuntu/12.10/x86_64/ruby-2.1.1.tar.bz2
https://rvm.io/binaries/ubuntu/12.10/x86_64/ruby-2.1.2.tar.bz2
https://rvm.io/binaries/ubuntu/12.10/x86_64/ruby-2.1.3.tar.bz2
https://rvm.io/binaries/ubuntu/13.04/i386/ruby-1.9.3-p429.tar.bz2
https://rvm.io/binaries/ubuntu/13.04/i386/ruby-1.9.3-p448.tar.bz2
https://rvm.io/binaries/ubuntu/13.04/i386/ruby-1.9.3-p484.tar.bz2
Expand All @@ -280,9 +308,11 @@ https://rvm.io/binaries/ubuntu/13.04/i386/ruby-2.0.0-p247.tar.bz2
https://rvm.io/binaries/ubuntu/13.04/i386/ruby-2.0.0-p353.tar.bz2
https://rvm.io/binaries/ubuntu/13.04/i386/ruby-2.0.0-p451.tar.bz2
https://rvm.io/binaries/ubuntu/13.04/i386/ruby-2.0.0-p481.tar.bz2
https://rvm.io/binaries/ubuntu/13.04/i386/ruby-2.0.0-p576.tar.bz2
https://rvm.io/binaries/ubuntu/13.04/i386/ruby-2.1.0.tar.bz2
https://rvm.io/binaries/ubuntu/13.04/i386/ruby-2.1.1.tar.bz2
https://rvm.io/binaries/ubuntu/13.04/i386/ruby-2.1.2.tar.bz2
https://rvm.io/binaries/ubuntu/13.04/i386/ruby-2.1.3.tar.bz2
https://rvm.io/binaries/ubuntu/13.04/x86_64/ruby-1.9.3-p392.tar.bz2
https://rvm.io/binaries/ubuntu/13.04/x86_64/ruby-1.9.3-p429.tar.bz2
https://rvm.io/binaries/ubuntu/13.04/x86_64/ruby-1.9.3-p448.tar.bz2
Expand All @@ -295,12 +325,18 @@ https://rvm.io/binaries/ubuntu/13.04/x86_64/ruby-2.0.0-p247.tar.bz2
https://rvm.io/binaries/ubuntu/13.04/x86_64/ruby-2.0.0-p353.tar.bz2
https://rvm.io/binaries/ubuntu/13.04/x86_64/ruby-2.0.0-p451.tar.bz2
https://rvm.io/binaries/ubuntu/13.04/x86_64/ruby-2.0.0-p481.tar.bz2
https://rvm.io/binaries/ubuntu/13.04/x86_64/ruby-2.0.0-p576.tar.bz2
https://rvm.io/binaries/ubuntu/13.04/x86_64/ruby-2.1.0.tar.bz2
https://rvm.io/binaries/ubuntu/13.04/x86_64/ruby-2.1.1.tar.bz2
https://rvm.io/binaries/ubuntu/13.04/x86_64/ruby-2.1.2.tar.bz2
https://rvm.io/binaries/ubuntu/13.04/x86_64/ruby-2.1.3.tar.bz2
https://rvm.io/binaries/ubuntu/13.10/x86_64/ruby-1.9.3-p547.tar.bz2
https://rvm.io/binaries/ubuntu/13.10/x86_64/ruby-2.0.0-p481.tar.bz2
https://rvm.io/binaries/ubuntu/13.10/x86_64/ruby-2.0.0-p576.tar.bz2
https://rvm.io/binaries/ubuntu/13.10/x86_64/ruby-2.1.2.tar.bz2
https://rvm.io/binaries/ubuntu/13.10/x86_64/ruby-2.1.3.tar.bz2
https://rvm.io/binaries/ubuntu/14.04/x86_64/ruby-1.9.3-p547.tar.bz2
https://rvm.io/binaries/ubuntu/14.04/x86_64/ruby-2.0.0-p481.tar.bz2
https://rvm.io/binaries/ubuntu/14.04/x86_64/ruby-2.0.0-p576.tar.bz2
https://rvm.io/binaries/ubuntu/14.04/x86_64/ruby-2.1.2.tar.bz2
https://rvm.io/binaries/ubuntu/14.04/x86_64/ruby-2.1.3.tar.bz2
Loading

0 comments on commit 6e9e8a9

Please sign in to comment.