aboutsummaryrefslogtreecommitdiffstats
path: root/ChangeLog
diff options
context:
space:
mode:
authorknu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-05-01 07:52:09 +0000
committerknu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-05-01 07:52:09 +0000
commitf7b562ef0114d8421d7d1cc6595e0c056feada8f (patch)
treefc2f5077f82c31f40f634e83da9acb58e47f55c0 /ChangeLog
parent8dded0725b1ed215c8da1131a132b4ca6eb2f434 (diff)
downloadruby-f7b562ef0114d8421d7d1cc6595e0c056feada8f.tar.gz
* lib/set.rb (Set#merge): Only directly use the passed objects
@hash instance variable when self and the passed object are instances of the same class. [Bug #118] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@23321 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog6
1 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 38950333c1..1bb9d1f085 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri May 1 16:50:05 2009 Akinori MUSHA <knu@iDaemons.org>
+
+ * lib/set.rb (Set#merge): Only directly use the passed objects
+ @hash instance variable when self and the passed object are
+ instances of the same class. [Bug #118]
+
Fri May 1 16:44:11 2009 Akinori MUSHA <knu@iDaemons.org>
* lib/set.rb (SortedSet#add): Do not let an uncomparable object