nagachika	2014-05-05 00:17:10 +0900 (Mon, 05 May 2014)

  New Revision: 45810

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=45810

  Log:
    merge revision(s) r45393: [Backport #9668]
    
    * gc.c: Fix up default GC params by @csfrancis [fix GH-556]

  Modified directories:
    branches/ruby_2_1/
  Modified files:
    branches/ruby_2_1/ChangeLog
    branches/ruby_2_1/gc.c
    branches/ruby_2_1/version.h
Index: ruby_2_1/ChangeLog
===================================================================
--- ruby_2_1/ChangeLog	(revision 45809)
+++ ruby_2_1/ChangeLog	(revision 45810)
@@ -1,3 +1,7 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ChangeLog#L1
+Mon May  5 00:16:35 2014  SHIBATA Hiroshi  <shibata.hiroshi@g...>
+
+	* gc.c: Fix up default GC params by @csfrancis [fix GH-556]
+
 Fri May  2 00:19:36 2014  Nobuyoshi Nakada  <nobu@r...>
 
 	* ext/openssl/ossl.c (ossl_make_error): check NULL for unknown
Index: ruby_2_1/gc.c
===================================================================
--- ruby_2_1/gc.c	(revision 45809)
+++ ruby_2_1/gc.c	(revision 45810)
@@ -150,8 +150,8 @@ typedef struct { https://github.com/ruby/ruby/blob/trunk/ruby_2_1/gc.c#L150
 } ruby_gc_params_t;
 
 static ruby_gc_params_t gc_params = {
-    GC_HEAP_FREE_SLOTS,
     GC_HEAP_INIT_SLOTS,
+    GC_HEAP_FREE_SLOTS,
     GC_HEAP_GROWTH_FACTOR,
     GC_HEAP_GROWTH_MAX_SLOTS,
     GC_HEAP_OLDOBJECT_LIMIT_FACTOR,
Index: ruby_2_1/version.h
===================================================================
--- ruby_2_1/version.h	(revision 45809)
+++ ruby_2_1/version.h	(revision 45810)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/version.h#L1
 #define RUBY_VERSION "2.1.2"
-#define RUBY_RELEASE_DATE "2014-05-02"
-#define RUBY_PATCHLEVEL 83
+#define RUBY_RELEASE_DATE "2014-05-05"
+#define RUBY_PATCHLEVEL 84
 
 #define RUBY_RELEASE_YEAR 2014
 #define RUBY_RELEASE_MONTH 5
-#define RUBY_RELEASE_DAY 2
+#define RUBY_RELEASE_DAY 5
 
 #include "ruby/version.h"
 

Property changes on: ruby_2_1
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r45393


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