From dca69588f4a46e1ecc94eeb9e01efc8cd7cb82e4 Mon Sep 17 00:00:00 2001
From: naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 11 Mar 2019 12:57:34 +0000
Subject: merge revision(s) 67217: [Backport #15658]

	The combination of non-Symbol keys and Symbol keys is now allowed again

	Revert r64358.  [Bug #15658]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_6@67220 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 NEWS | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

(limited to 'NEWS')

diff --git a/NEWS b/NEWS
index c07a78145d..1acc5ceb05 100644
--- a/NEWS
+++ b/NEWS
@@ -35,8 +35,6 @@ sufficient information, see the ChangeLog file or Redmine
     (1...).each {|index| block }          # infinite loop from index 1
     ary.zip(1..) {|elem, index| block }   # ary.each.with_index(1) { }
 
-* Non-Symbol keys in a keyword arguments hash cause an exception.
-
 * The "shadowing outer local variable" warning is removed.  [Feature #12490]
 
   You can now write the following without warning:
@@ -48,6 +46,9 @@ sufficient information, see the ChangeLog file or Redmine
 
 * The flip-flop syntax is deprecated. [Feature #5400]
 
+* Non-Symbol keys in a keyword arguments hash was prohibited at 2.6.0, but
+  now allowed again.  [Bug #15658]
+
 === Core classes updates (outstanding ones only)
 
 [Array]
@@ -571,6 +572,7 @@ sufficient information, see the ChangeLog file or Redmine
 
 === Stdlib compatibility issues (excluding feature bug fixes)
 
+<<<<<<< .working
 * These standard libraries have been promoted to default gems.
 
   * e2mmap
@@ -588,6 +590,13 @@ sufficient information, see the ChangeLog file or Redmine
   * thwait
   * tracer
 
+||||||| .merge-left.r67216
+profile.rb, Profiler__::
+
+  * Removed from standard library. No one maintains it from Ruby 2.0.0.
+
+=======
+>>>>>>> .merge-right.r67217
 [BigDecimal]
 
   * The following methods are removed.
-- 
cgit v1.2.3