summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-07-10 04:05:47 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-07-10 04:05:47 +0000
commit12ce5781965faa81fafb7c20d47429111ba50f31 (patch)
tree9a7dd145c17b5c5c3c6ea96c1af81bf884993eac /ChangeLog
parent7db58f199efc7d31d66ee7b7a7dd272bb0cd9f27 (diff)
merges r28541 from trunk into ruby_1_9_2.
-- * ext/psych/lib/psych/scalar_scanner.rb (parse_string): support timezones that are not one hour off. [ruby-core:31023] * ext/psych/lib/psych/visitors/yaml_tree.rb: ditto -- * test/psych/test_date_time.rb (TestDateTime#test_round_trip_with_offset): test for [ruby-core:31023]. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@28601 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog12
1 files changed, 12 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index dd0427c63a..aeb0b102bc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+Sat Jul 10 11:41:54 2010 Yuki Sonoda (Yugui) <yugui@yugui.jp>
+
+ * test/psych/test_date_time.rb (TestDateTime#test_round_trip_with_offset):
+ test for [ruby-core:31023].
+
+Mon Jul 5 12:32:01 2010 Aaron Patterson <aaron@tenderlovemaking.com>
+
+ * ext/psych/lib/psych/scalar_scanner.rb (parse_string): support
+ timezones that are not one hour off. [ruby-core:31023]
+
+ * ext/psych/lib/psych/visitors/yaml_tree.rb: ditto
+
Sat Jul 3 09:47:26 2010 Aaron Patterson <aaron@tenderlovemaking.com>
* ext/psych/lib/psych/visitors/to_ruby.rb(visit_Psych_Nodes_Scalar):