1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

merge revision(s) r49752,r49753: [Backport #10953]

* spec/default.mspec: remove specific version number.
	  7a909e925c

	* spec/default.mspec: use default configuration file name.
	  cc69f337b0


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@49909 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nagachika 2015-03-09 13:39:18 +00:00
parent cac1786add
commit 9ee867c44f
3 changed files with 12 additions and 2 deletions

View file

@ -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> Mon Mar 9 22:27:47 2015 SHIBATA Hiroshi <shibata.hiroshi@gmail.com>
* common.mk: use ruby organization for rubyspec. * common.mk: use ruby organization for rubyspec.

View file

@ -1,4 +1,4 @@
load File.dirname(__FILE__) + '/rubyspec/ruby.1.9.mspec' load File.dirname(__FILE__) + '/rubyspec/default.mspec'
class MSpecScript class MSpecScript
builddir = Dir.pwd builddir = Dir.pwd
srcdir = ENV['SRCDIR'] srcdir = ENV['SRCDIR']

View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.1.5" #define RUBY_VERSION "2.1.5"
#define RUBY_RELEASE_DATE "2015-03-09" #define RUBY_RELEASE_DATE "2015-03-09"
#define RUBY_PATCHLEVEL 308 #define RUBY_PATCHLEVEL 309
#define RUBY_RELEASE_YEAR 2015 #define RUBY_RELEASE_YEAR 2015
#define RUBY_RELEASE_MONTH 3 #define RUBY_RELEASE_MONTH 3