diff --git a/ChangeLog b/ChangeLog index a8e16408e8..e42b124395 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Fri Feb 6 12:05:13 2015 SHIBATA Hiroshi + + * thread.c: Improve documentation for Thread#value + [Bug #10694][ruby-core:67324][ci skip] + Fri Feb 6 12:02:05 2015 Nobuyoshi Nakada * ext/fiddle/win32/libffi.mk.tmpl: assemble without directory prefix. diff --git a/thread.c b/thread.c index 5d8ac7eb04..35da97cde2 100644 --- a/thread.c +++ b/thread.c @@ -959,10 +959,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 5f3fe4ef14..562a157c0c 100644 --- a/version.h +++ b/version.h @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.2.0" #define RUBY_RELEASE_DATE "2015-02-06" -#define RUBY_PATCHLEVEL 40 +#define RUBY_PATCHLEVEL 41 #define RUBY_RELEASE_YEAR 2015 #define RUBY_RELEASE_MONTH 2