summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorknu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-11-21 07:26:53 +0000
committerknu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-11-21 07:26:53 +0000
commitd3edb4a85e08bbcd208f0a201f187d9ddd0a918d (patch)
tree4d5c364cce20a3106d4789f8b96d986b89accf8b /ChangeLog
parentf0dfcefa48654318286e37f853971178b1ff593f (diff)
* test/uri/test_generic.rb (URI#test_merge): Test uri + URI(path)
in addition to uri + path. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43751 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog5
1 files changed, 5 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 34882acec8..deb405c9b1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Nov 21 16:25:08 2013 Akinori MUSHA <knu@iDaemons.org>
+
+ * test/uri/test_generic.rb (URI#test_merge): Test uri + URI(path)
+ in addition to uri + path.
+
Thu Nov 21 15:36:08 2013 Zachary Scott <e@zzak.io>
* ext/openssl/lib/openssl/buffering.rb: [DOC] Fix HEREDOC comment for