Merge branch 'master' into rabbitmq-server-589

Conflicts:
	Makefile

1 files changed, 4 insertions, 4 deletions

diff --git a/Makefile b/Makefile
index 33f309f483..dfe7137c4a 100644
--- a/Makefile
+++ b/Makefile
@@ -89,11 +89,11 @@ define PROJECT_ENV
 	    %% setting has no effect because credit_flow is not used when
 	    %% writing to the queue index. See the setting
 	    %% queue_index_embed_msgs_below above.
-	    {msg_store_credit_disc_bound, {2000, 500}},
+	    {msg_store_credit_disc_bound, {3000, 800}},
 	    {msg_store_io_batch_size, 2048},
 	    %% see rabbitmq-server#143
 	    %% and rabbitmq-server#949
-	    {credit_flow_default_credit, {200, 100}},
+	    {credit_flow_default_credit, {400, 200}},
 	    %% see rabbitmq-server#248
 	    %% and rabbitmq-server#667
 	    {channel_operation_timeout, 15000},
@@ -112,8 +112,8 @@ define PROJECT_ENV
 	    %% rabbitmq-server-973
 	    {queue_explicit_gc_run_operation_threshold, 1000},
 	    {lazy_queue_explicit_gc_run_operation_threshold, 1000},
-	    {background_gc_enabled, true},
-	    {background_gc_target_interval, 60000},
+	    {background_gc_enabled, false},
+	    {background_gc_target_interval, 60000}
 	    %% rabbitmq-server-589
 	    {proxy_protocol, false}
 	  ]