summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-10-31 14:06:50 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-10-31 14:06:50 +0000
commit53293d3c627ac25ff2978859dabeaca14a6fe7b7 (patch)
treed5fe262d73e52897882aa0e5e53f6e03eb59e106 /ChangeLog
parent97a5506fd5b0559977944f6e907ae9bac3a21ca4 (diff)
merge revision(s) 43177,43191: [Backport #8991]
* lib/time.rb (Time.strptime): Use :offset. Patch by Felipe Contreras. [ruby-core:57694] * lib/time.rb (Time.strptime): Time.strptime('0', '%s') returns local time Time object as Ruby 2.0 and before. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@43483 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog10
1 files changed, 10 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 27f6c79c57..3f52eba826 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Thu Oct 31 23:05:33 2013 Tanaka Akira <akr@fsij.org>
+
+ * lib/time.rb (Time.strptime): Time.strptime('0', '%s') returns local
+ time Time object as Ruby 2.0 and before.
+
+Thu Oct 31 23:05:33 2013 Tanaka Akira <akr@fsij.org>
+
+ * lib/time.rb (Time.strptime): Use :offset.
+ Patch by Felipe Contreras. [ruby-core:57694]
+
Thu Oct 31 22:49:56 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* io.c (rb_io_close_read): duplex IO should wait its child process