naruse	2016-01-21 16:41:11 +0900 (Thu, 21 Jan 2016)

  New Revision: 53608

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

  Log:
    merge revision(s) 53607:
    
    * Makefile.in (update-rubyspec): fix r53208 like r53451.

  Modified directories:
    branches/ruby_2_3/
  Modified files:
    branches/ruby_2_3/ChangeLog
    branches/ruby_2_3/Makefile.in
    branches/ruby_2_3/version.h
Index: ruby_2_3/ChangeLog
===================================================================
--- ruby_2_3/ChangeLog	(revision 53607)
+++ ruby_2_3/ChangeLog	(revision 53608)
@@ -1,3 +1,7 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_3/ChangeLog#L1
+Thu Jan 21 16:39:55 2016  NARUSE, Yui  <naruse@r...>
+
+	* Makefile.in (update-rubyspec): fix r53208 like r53451.
+
 Fri Jan 15 00:05:57 2016  NARUSE, Yui  <naruse@r...>
 
 	* lib/uri/generic.rb (URI::Generic#to_s): change encoding to
Index: ruby_2_3/version.h
===================================================================
--- ruby_2_3/version.h	(revision 53607)
+++ ruby_2_3/version.h	(revision 53608)
@@ -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-01-20"
-#define RUBY_PATCHLEVEL 6
+#define RUBY_RELEASE_DATE "2016-01-21"
+#define RUBY_PATCHLEVEL 7
 
 #define RUBY_RELEASE_YEAR 2016
 #define RUBY_RELEASE_MONTH 1
-#define RUBY_RELEASE_DAY 20
+#define RUBY_RELEASE_DAY 21
 
 #include "ruby/version.h"
 
Index: ruby_2_3/Makefile.in
===================================================================
--- ruby_2_3/Makefile.in	(revision 53607)
+++ ruby_2_3/Makefile.in	(revision 53608)
@@ -469,12 +469,12 @@ update-mspec: https://github.com/ruby/ruby/blob/trunk/ruby_2_3/Makefile.in#L469
 	@$(CHDIR) $(srcdir); \
 	if [ -d spec/mspec ]; then \
 	  echo updating mspec ...; \
-	  $(Q:@=:) set -x; \
+	  $(Q1:0=:) set -x; \
 	  cd spec/mspec && \
 	  exec git pull; \
 	else \
 	  echo retrieving mspec ...; \
-	  $(Q:@=:) set -x; \
+	  $(Q1:0=:) set -x; \
 	  exec git clone $(MSPEC_GIT_URL) spec/mspec; \
 	fi
 
@@ -482,12 +482,12 @@ update-rubyspec: update-mspec https://github.com/ruby/ruby/blob/trunk/ruby_2_3/Makefile.in#L482
 	@$(CHDIR) $(srcdir); \
 	if [ -d spec/rubyspec ]; then \
 	  echo updating rubyspec ...; \
-	  $(Q:@=:) set -x; \
+	  $(Q1:0=:) set -x; \
 	  cd spec/rubyspec && \
 	  exec git pull; \
 	else \
 	  echo retrieving rubyspec ...; \
-	  $(Q:@=:) set -x; \
+	  $(Q1:0=:) set -x; \
 	  exec git clone $(RUBYSPEC_GIT_URL) spec/rubyspec; \
 	fi
 
@@ -498,13 +498,13 @@ update-doclie: https://github.com/ruby/ruby/blob/trunk/ruby_2_3/Makefile.in#L498
 	@$(CHDIR) $(srcdir); \
 	if [ -d coverage/doclie ]; then \
 	  echo updating doclie ...; \
-	  $(Q:@=:) set -x; \
+	  $(Q1:0=:) set -x; \
 	  cd coverage/doclie && \
 	  git fetch && \
 	  exec git checkout $(DOCLIE_GIT_REF); \
 	else \
 	  echo retrieving doclie ...; \
-	  $(Q:@=:) set -x; \
+	  $(Q1:0=:) set -x; \
 	  exec git clone --branch $(DOCLIE_GIT_REF) $(DOCLIE_GIT_URL) coverage/doclie; \
 	fi
 
@@ -512,7 +512,7 @@ update-simplecov-html: https://github.com/ruby/ruby/blob/trunk/ruby_2_3/Makefile.in#L512
 	@$(CHDIR) $(srcdir); \
 	if [ -d coverage/simplecov-html ]; then \
 	  echo updating simplecov-html ...; \
-	  $(Q:@=:) set -x; \
+	  $(Q1:0=:) set -x; \
 	  cd coverage/simplecov-html && \
 	  git fetch && \
 	  exec git checkout $(SIMPLECOV_HTML_GIT_REF); \
@@ -525,13 +525,13 @@ update-simplecov: https://github.com/ruby/ruby/blob/trunk/ruby_2_3/Makefile.in#L525
 	@$(CHDIR) $(srcdir); \
 	if [ -d coverage/simplecov ]; then \
 	  echo updating simplecov ...; \
-	  $(Q:@=:) set -x; \
+	  $(Q1:0=:) set -x; \
 	  cd coverage/simplecov && \
 	  git fetch && \
 	  exec git checkout $(SIMPLECOV_GIT_REF); \
 	else \
 	  echo retrieving simplecov ...; \
-	  $(Q:@=:) set -x; \
+	  $(Q1:0=:) set -x; \
 	  exec git clone --branch $(SIMPLECOV_GIT_REF) $(SIMPLECOV_GIT_URL) coverage/simplecov; \
 	fi
 

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


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