diff options
author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-03-09 13:39:18 +0000 |
---|---|---|
committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-03-09 13:39:18 +0000 |
commit | 9ee867c44f70452c9871c69d4b6f2328d3d5cc70 (patch) | |
tree | c51e15e747466dd03cb929c040dba8bf7c893c80 | |
parent | cac1786add3304434e5b6ab1b9cfda5df0f8fcd0 (diff) | |
download | ruby-9ee867c44f70452c9871c69d4b6f2328d3d5cc70.tar.gz |
merge revision(s) r49752,r49753: [Backport #10953]
* spec/default.mspec: remove specific version number.
https://github.com/ruby/rubyspec/commit/7a909e925c1baa9c700bd44af9241aef6e596714
* spec/default.mspec: use default configuration file name.
https://github.com/ruby/rubyspec/commit/cc69f337b06362e5607ffa3e3ad40ef7494960cf
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@49909 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 10 | ||||
-rw-r--r-- | spec/default.mspec | 2 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 12 insertions, 2 deletions
@@ -1,3 +1,13 @@ +Mon Mar 9 22:30:50 2015 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> + + * spec/default.mspec: use default configuration file name. + https://github.com/ruby/rubyspec/commit/cc69f337b06362e5607ffa3e3ad40ef7494960cf + +Mon Mar 9 22:30:50 2015 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> + + * spec/default.mspec: remove specific version number. + https://github.com/ruby/rubyspec/commit/7a909e925c1baa9c700bd44af9241aef6e596714 + Mon Mar 9 22:27:47 2015 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> * common.mk: use ruby organization for rubyspec. diff --git a/spec/default.mspec b/spec/default.mspec index c4b75f614a..e45526c7ac 100644 --- a/spec/default.mspec +++ b/spec/default.mspec @@ -1,4 +1,4 @@ -load File.dirname(__FILE__) + '/rubyspec/ruby.1.9.mspec' +load File.dirname(__FILE__) + '/rubyspec/default.mspec' class MSpecScript builddir = Dir.pwd srcdir = ENV['SRCDIR'] @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.1.5" #define RUBY_RELEASE_DATE "2015-03-09" -#define RUBY_PATCHLEVEL 308 +#define RUBY_PATCHLEVEL 309 #define RUBY_RELEASE_YEAR 2015 #define RUBY_RELEASE_MONTH 3 |