summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--version.h6
-rw-r--r--vm_core.h2
3 files changed, 9 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index abc5399e4c..86e9666ae5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Dec 31 13:26:22 2014 Eric Wong <e@80x24.org>
+
+ * 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@ruby-lang.org>
* tool/rbinstall.rb: skip installing bundle gems if zlib is unavailable.
diff --git a/version.h b/version.h
index 51b7b640a9..6b4b68930f 100644
--- a/version.h
+++ b/version.h
@@ -1,10 +1,10 @@
#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"
diff --git a/vm_core.h b/vm_core.h
index 93163098e2..809da4e86f 100644
--- a/vm_core.h
+++ b/vm_core.h
@@ -975,7 +975,7 @@ rb_vm_living_threads_init(rb_vm_t *vm)
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++;
}