ruby-changes:36996
From: naruse <ko1@a...>
Date: Wed, 31 Dec 2014 13:27:16 +0900 (JST)
Subject: [ruby-changes:36996] naruse:r49077 (ruby_2_2): merge revision(s) 49036: [Backport #10660]
naruse 2014-12-31 13:27:02 +0900 (Wed, 31 Dec 2014) New Revision: 49077 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=49077 Log: merge revision(s) 49036: [Backport #10660] * vm_core.h (rb_vm_living_threads_insert): preserve order [Bug #10660] [ruby-core:67154] [ruby-core:67159] Modified directories: branches/ruby_2_2/ Modified files: branches/ruby_2_2/ChangeLog branches/ruby_2_2/version.h branches/ruby_2_2/vm_core.h Index: ruby_2_2/ChangeLog =================================================================== --- ruby_2_2/ChangeLog (revision 49076) +++ ruby_2_2/ChangeLog (revision 49077) @@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ChangeLog#L1 +Wed Dec 31 13:26:22 2014 Eric Wong <e@8...> + + * vm_core.h (rb_vm_living_threads_insert): preserve order + [Bug #10660] [ruby-core:67154] [ruby-core:67159] + Fri Dec 26 15:42:27 2014 NAKAMURA Usaku <usa@r...> * tool/rbinstall.rb: skip installing bundle gems if zlib is unavailable. Index: ruby_2_2/vm_core.h =================================================================== --- ruby_2_2/vm_core.h (revision 49076) +++ ruby_2_2/vm_core.h (revision 49077) @@ -975,7 +975,7 @@ rb_vm_living_threads_init(rb_vm_t *vm) https://github.com/ruby/ruby/blob/trunk/ruby_2_2/vm_core.h#L975 static inline void rb_vm_living_threads_insert(rb_vm_t *vm, rb_thread_t *th) { - list_add(&vm->living_threads, &th->vmlt_node); + list_add_tail(&vm->living_threads, &th->vmlt_node); vm->living_thread_num++; } Index: ruby_2_2/version.h =================================================================== --- ruby_2_2/version.h (revision 49076) +++ ruby_2_2/version.h (revision 49077) @@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/version.h#L1 #define RUBY_VERSION "2.2.0" -#define RUBY_RELEASE_DATE "2014-12-26" -#define RUBY_PATCHLEVEL 1 +#define RUBY_RELEASE_DATE "2014-12-31" +#define RUBY_PATCHLEVEL 2 #define RUBY_RELEASE_YEAR 2014 #define RUBY_RELEASE_MONTH 12 -#define RUBY_RELEASE_DAY 26 +#define RUBY_RELEASE_DAY 31 #include "ruby/version.h" Property changes on: ruby_2_2 ___________________________________________________________________ Modified: svn:mergeinfo Merged /trunk:r49036 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/