naruse	2018-02-23 06:29:36 +0900 (Fri, 23 Feb 2018)

  New Revision: 62537

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

  Log:
    merge revision(s) 61605,62359,62361: [Backport #14356]
    
    Try to fix Travis CI configuration.
    
    .travis.yml: send notification to #alerts
    
    instead of #commits.
    
    .travis.yml: resurrect notification to #commits
    
    I heard at least Shibata-san sees the channel for the notification.
    But I want #alets to have all CI failure notifications too.

  Modified directories:
    branches/ruby_2_5/
  Modified files:
    branches/ruby_2_5/.travis.yml
    branches/ruby_2_5/version.h
Index: ruby_2_5/.travis.yml
===================================================================
--- ruby_2_5/.travis.yml	(revision 62536)
+++ ruby_2_5/.travis.yml	(revision 62537)
@@ -88,7 +88,9 @@ notifications: https://github.com/ruby/ruby/blob/trunk/ruby_2_5/.travis.yml#L88
       - "%{message} by @%{author}: See %{build_url}"
 
   slack:
-    secure: TNRGiWGytGSLDAjJLR0NVXKlHhba6Kf584wU7mXqiOCDNBQ0LHUsrIMaL38uvpnzQ6NeV5j5k575LAZyuGXKczSrOTeIBJaHfw6Wj/8WUnifnNcIFozZ5DH9/S2EuiVcslDmoRflOFSTkocpE0MElt2KU2kNCzeq3/iVatNT8Nw=
+    rooms:
+      - secure: i1GLETSKye85ea6dGNA3MxI/5myChmMFiZtBd5C69xK+s1sBFqEgOSbaSf9KHc0CYrHVyNhQMaZRruieV7xS+6Pfs0Zvxf1DO6QQTWC2KhkqwFDLvZncAzjoyASdR90hbr+iRPOngQ+HJuE94zemALAwEqNAinzA74PMiJXktqY= # ruby:<token>#commits
+      - secure: ah7UEHBvncXT7bM5mvYIQAO+tIyV/wl7nXLb7wQD16dO2v8Gragy0mWjB79Q09hrrMGmp6H9bCDpdGS80boIA5EHaHoG4QaP0i9bsSt8U2AMWgZtfyIgQKJ4H2kXkGlrjO+AXTgnIkP7LNjdgAVUUTGQPb26T3QmoN2Splt+fIQ= # ruby:<token>#alerts
     on_pull_requests: false
     on_success: change
     on_failure: always
Index: ruby_2_5/version.h
===================================================================
--- ruby_2_5/version.h	(revision 62536)
+++ ruby_2_5/version.h	(revision 62537)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_5/version.h#L1
 #define RUBY_VERSION "2.5.0"
-#define RUBY_RELEASE_DATE "2018-02-22"
-#define RUBY_PATCHLEVEL 30
+#define RUBY_RELEASE_DATE "2018-02-23"
+#define RUBY_PATCHLEVEL 31
 
 #define RUBY_RELEASE_YEAR 2018
 #define RUBY_RELEASE_MONTH 2
-#define RUBY_RELEASE_DAY 22
+#define RUBY_RELEASE_DAY 23
 
 #include "ruby/version.h"
 
Index: ruby_2_5
===================================================================
--- ruby_2_5	(revision 62536)
+++ ruby_2_5	(revision 62537)

Property changes on: ruby_2_5
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /trunk:r61605,62359,62361

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