From db0f86030891ee91fb2e2b116dcc05bb3bcc019e Mon Sep 17 00:00:00 2001 From: nagachika Date: Mon, 9 Mar 2015 17:40:36 +0000 Subject: [PATCH] merge revision(s) r49428: [Backport #10694] * thread.c: Improve documentation for Thread#value [Bug #10694][ruby-core:67324][ci skip] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@49912 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ thread.c | 6 +++++- version.h | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6f7a3303a4..5a51c72272 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Tue Mar 10 02:40:11 2015 SHIBATA Hiroshi + + * thread.c: Improve documentation for Thread#value + [Bug #10694][ruby-core:67324][ci skip] + Tue Mar 10 02:37:55 2015 SHIBATA Hiroshi * string.c: [DOC] Add missing documentation around String#chomp. diff --git a/thread.c b/thread.c index b24d29e087..605ac60c08 100644 --- a/thread.c +++ b/thread.c @@ -916,10 +916,14 @@ thread_join_m(int argc, VALUE *argv, VALUE self) * call-seq: * thr.value -> obj * - * Waits for +thr+ to complete, using #join, and returns its value. + * Waits for +thr+ to complete, using #join, and returns its value or raises + * the exception which terminated the thread. * * a = Thread.new { 2 + 2 } * a.value #=> 4 + * + * b = Thread.new { raise 'something went wrong' } + * b.value #=> RuntimeError: something went wrong */ static VALUE diff --git a/version.h b/version.h index 1eae730035..2798b80d5d 100644 --- a/version.h +++ b/version.h @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.1.5" #define RUBY_RELEASE_DATE "2015-03-10" -#define RUBY_PATCHLEVEL 311 +#define RUBY_PATCHLEVEL 312 #define RUBY_RELEASE_YEAR 2015 #define RUBY_RELEASE_MONTH 3