naruse	2016-04-15 14:27:54 +0900 (Fri, 15 Apr 2016)

  New Revision: 54592

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=54592

  Log:
    merge revision(s) 54576:
    
    * lib/irb/ext/save-history.rb: suppress warning: method redefined;
      discarding old save_history=.

  Modified directories:
    branches/ruby_2_3/
  Modified files:
    branches/ruby_2_3/ChangeLog
    branches/ruby_2_3/lib/irb/ext/save-history.rb
    branches/ruby_2_3/version.h
Index: ruby_2_3/ChangeLog
===================================================================
--- ruby_2_3/ChangeLog	(revision 54591)
+++ ruby_2_3/ChangeLog	(revision 54592)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_3/ChangeLog#L1
+Fri Apr 15 14:27:48 2016  NARUSE, Yui  <naruse@r...>
+
+	* lib/irb/ext/save-history.rb: suppress warning: method redefined;
+	  discarding old save_history=.
+
 Tue Apr 12 16:15:39 2016  NARUSE, Yui  <naruse@r...>
 
 	* configure.in: improve ICC (Intel C Compiler) support.
Index: ruby_2_3/version.h
===================================================================
--- ruby_2_3/version.h	(revision 54591)
+++ ruby_2_3/version.h	(revision 54592)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_3/version.h#L1
 #define RUBY_VERSION "2.3.0"
-#define RUBY_RELEASE_DATE "2016-04-12"
-#define RUBY_PATCHLEVEL 78
+#define RUBY_RELEASE_DATE "2016-04-15"
+#define RUBY_PATCHLEVEL 79
 
 #define RUBY_RELEASE_YEAR 2016
 #define RUBY_RELEASE_MONTH 4
-#define RUBY_RELEASE_DAY 12
+#define RUBY_RELEASE_DAY 15
 
 #include "ruby/version.h"
 
Index: ruby_2_3/lib/irb/ext/save-history.rb
===================================================================
--- ruby_2_3/lib/irb/ext/save-history.rb	(revision 54591)
+++ ruby_2_3/lib/irb/ext/save-history.rb	(revision 54592)
@@ -27,6 +27,7 @@ module IRB https://github.com/ruby/ruby/blob/trunk/ruby_2_3/lib/irb/ext/save-history.rb#L27
       IRB.conf[:SAVE_HISTORY]
     end
 
+    remove_method :save_history=
     # Sets <code>IRB.conf[:SAVE_HISTORY]</code> to the given +val+ and calls
     # #init_save_history with this context.
     #

Property changes on: ruby_2_3
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r54576


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/