diff options
author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-01-14 07:04:09 +0000 |
---|---|---|
committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-01-14 07:04:09 +0000 |
commit | 9120d051e14a69d3c1e439d65d85a4a8060d62fb (patch) | |
tree | 1263a58684cbdedf82ed343a11b7bae00f441881 /version.h | |
parent | e6a5f817d613dbd40cf2d19cd0705a1b4c377538 (diff) |
merge revision(s) 48744,48752: [Backport #10579]
* eval.c (rb_frame_last_func): return the most recent frame method
name.
* thread.c (recursive_list_access): use the last method name,
instead of the current method name which can be unset in some
cases, not to use a symbol by the invalid ID.
[ruby-core:66742] [Bug #10579]
* thread.c (exec_recursive): use the same last method name as
recursive_push in the error message when recursive_pop failed.
[ruby-core:66742] [Bug #10579]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@49246 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'version.h')
-rw-r--r-- | version.h | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1,6 +1,6 @@ #define RUBY_VERSION "2.0.0" #define RUBY_RELEASE_DATE "2015-01-14" -#define RUBY_PATCHLEVEL 607 +#define RUBY_PATCHLEVEL 608 #define RUBY_RELEASE_YEAR 2015 #define RUBY_RELEASE_MONTH 1 |