summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-04-29 03:33:44 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-04-29 03:33:44 +0000
commita209486a134d8ea0d6622f5b26d1e95099e1cf61 (patch)
tree09ec255d1495d5ec66736bfeec390ee847c66868
parent255b55a3dda322aa0b5efd0f5510c6d7728c3983 (diff)
* lib/thwait.rb (ThreadsWait#join): refined rdoc. [ruby-core:29863]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@27542 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--lib/thwait.rb3
-rw-r--r--version.h6
3 files changed, 9 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 1e51729210..05599b3299 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Thu Apr 29 12:33:42 2010 Nobuyoshi Nakada <[email protected]>
+
+ * lib/thwait.rb (ThreadsWait#join): refined rdoc. [ruby-core:29863]
+
Tue Apr 27 18:00:50 2010 Nobuyoshi Nakada <[email protected]>
* lib/net/smtp.rb (Net::SMTP#rcptto_list): fixed typo.
diff --git a/lib/thwait.rb b/lib/thwait.rb
index 2f5cc41ba0..1a5ba9ed44 100644
--- a/lib/thwait.rb
+++ b/lib/thwait.rb
@@ -101,7 +101,8 @@ class ThreadsWait
end
#
- # Waits for specified threads to terminate.
+ # Waits for specified threads to terminate, and returns when any
+ # thread terminated.
#
def join(*threads)
join_nowait(*threads)
diff --git a/version.h b/version.h
index d356723d02..bc2b3ef123 100644
--- a/version.h
+++ b/version.h
@@ -1,7 +1,7 @@
#define RUBY_VERSION "1.8.8"
-#define RUBY_RELEASE_DATE "2010-04-27"
+#define RUBY_RELEASE_DATE "2010-04-29"
#define RUBY_VERSION_CODE 188
-#define RUBY_RELEASE_CODE 20100427
+#define RUBY_RELEASE_CODE 20100429
#define RUBY_PATCHLEVEL -1
#define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
#define RUBY_VERSION_TEENY 8
#define RUBY_RELEASE_YEAR 2010
#define RUBY_RELEASE_MONTH 4
-#define RUBY_RELEASE_DAY 27
+#define RUBY_RELEASE_DAY 29
#define NO_STRING_LITERAL_CONCATENATION 1
#ifdef RUBY_EXTERN