summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-06-10 07:20:59 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-06-10 07:20:59 +0000
commit9e7993794f54d1f5ed17f87adf65e86df69647ae (patch)
tree65d6cb92322a9efc16e7d56668c19cc81a22b6e7 /ChangeLog
parentbcd3f7863757d75a7bd232e442fed038e0fdcff5 (diff)
* lib/rubygems/core_ext/kernel_require.rb: -I should always win over
gems. [ruby-core:74814] [Backport #12248] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@55357 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 2d4e6e4051..afd499eb88 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Jun 10 16:19:14 2016 Aaron Patterson <aaron.patterson@gmail.com>
+
+ * lib/rubygems/core_ext/kernel_require.rb: -I should always win over
+ gems. [ruby-core:74814] [Backport #12248]
+
Fri Jun 10 16:12:58 2016 Nobuyoshi Nakada <nobu@ruby-lang.org>
* variable.c (rb_local_constants_i): exclude hidden constants.