nagachika	2015-03-10 02:40:36 +0900 (Tue, 10 Mar 2015)

  New Revision: 49912

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=49912

  Log:
    merge revision(s) r49428: [Backport #10694]
    
    * thread.c: Improve documentation for Thread#value
      [Bug #10694][ruby-core:67324][ci skip]

  Modified directories:
    branches/ruby_2_1/
  Modified files:
    branches/ruby_2_1/ChangeLog
    branches/ruby_2_1/thread.c
    branches/ruby_2_1/version.h
Index: ruby_2_1/ChangeLog
===================================================================
--- ruby_2_1/ChangeLog	(revision 49911)
+++ ruby_2_1/ChangeLog	(revision 49912)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ChangeLog#L1
+Tue Mar 10 02:40:11 2015  SHIBATA Hiroshi  <shibata.hiroshi@g...>
+
+	* thread.c: Improve documentation for Thread#value
+	  [Bug #10694][ruby-core:67324][ci skip]
+
 Tue Mar 10 02:37:55 2015  SHIBATA Hiroshi  <shibata.hiroshi@g...>
 
 	* string.c: [DOC] Add missing documentation around String#chomp.
Index: ruby_2_1/thread.c
===================================================================
--- ruby_2_1/thread.c	(revision 49911)
+++ ruby_2_1/thread.c	(revision 49912)
@@ -916,10 +916,14 @@ thread_join_m(int argc, VALUE *argv, VAL https://github.com/ruby/ruby/blob/trunk/ruby_2_1/thread.c#L916
  *  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
Index: ruby_2_1/version.h
===================================================================
--- ruby_2_1/version.h	(revision 49911)
+++ ruby_2_1/version.h	(revision 49912)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/version.h#L1
 #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

Property changes on: ruby_2_1
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r49428


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/