merge revision(s) r45393: [Backport #9668]

	* gc.c: Fix up default GC params by @csfrancis [fix GH-556]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@45810 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 8 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index b03e17ebb4..c1c3bee4ed 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon May  5 00:16:35 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* gc.c: Fix up default GC params by @csfrancis [fix GH-556]
+
 Fri May  2 00:19:36 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* ext/openssl/ossl.c (ossl_make_error): check NULL for unknown
diff --git a/gc.c b/gc.c
index 2762db4529..58f6701ebc 100644
--- a/gc.c
+++ b/gc.c
@@ -150,8 +150,8 @@ typedef struct {
 } 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,
diff --git a/version.h b/version.h
index 90c452302b..3418bbc6a2 100644
--- a/version.h
+++ b/version.h
@@ -1,10 +1,10 @@
 #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"