nagachika	2014-07-04 00:41:30 +0900 (Fri, 04 Jul 2014)

  New Revision: 46674

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

  Log:
    merge revision(s) r45786: [Backport #9738]
    
    * lib/rinda/tuplespace.rb: fix document. [ruby-core:62003][Bug #9738]

  Modified directories:
    branches/ruby_2_1/
  Modified files:
    branches/ruby_2_1/lib/rinda/tuplespace.rb
    branches/ruby_2_1/version.h
Index: ruby_2_1/lib/rinda/tuplespace.rb
===================================================================
--- ruby_2_1/lib/rinda/tuplespace.rb	(revision 46673)
+++ ruby_2_1/lib/rinda/tuplespace.rb	(revision 46674)
@@ -76,7 +76,7 @@ module Rinda https://github.com/ruby/ruby/blob/trunk/ruby_2_1/lib/rinda/tuplespace.rb#L76
     # Reset the expiry time according to +sec_or_renewer+.
     #
     # +nil+::    it is set to expire in the far future.
-    # +false+::  it has expired.
+    # +true+::   it has expired.
     # Numeric::  it will expire in that many seconds.
     #
     # Otherwise the argument refers to some kind of renewer object
Index: ruby_2_1/version.h
===================================================================
--- ruby_2_1/version.h	(revision 46673)
+++ ruby_2_1/version.h	(revision 46674)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/version.h#L1
 #define RUBY_VERSION "2.1.2"
 #define RUBY_RELEASE_DATE "2014-07-04"
-#define RUBY_PATCHLEVEL 162
+#define RUBY_PATCHLEVEL 163
 
 #define RUBY_RELEASE_YEAR 2014
 #define RUBY_RELEASE_MONTH 7

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


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