Merge branch 'stable'

Make credit flow setting a tuple, per discussion with @videlalvaro.

1 files changed, 3 insertions, 3 deletions

diff --git a/ebin/rabbit_app.in b/ebin/rabbit_app.in
index fa70058930..ac60ed6825 100644
--- a/ebin/rabbit_app.in
+++ b/ebin/rabbit_app.in
@@ -84,8 +84,6 @@
          {ssl_apps, [asn1, crypto, public_key, ssl]},
          %% see rabbitmq-server#114
          {mirroring_flow_control, true},
-         {credit_flow_initial_credit, 200},
-         {credit_flow_more_credit_after, 50},
          %% see rabbitmq-server#227 and related tickets.
          %% msg_store_credit_disc_bound only takes effect when
          %% messages are persisted to the message store. If messages
@@ -94,5 +92,7 @@
          %% writing to the queue index. See the setting
          %% queue_index_embed_msgs_below above.
          {msg_store_credit_disc_bound, {2000, 500}},
-         {msg_store_io_batch_size, 2048}
+         {msg_store_io_batch_size, 2048},
+         %% see rabbitmq-server#143
+         {credit_flow_default_credit, {200, 50}}
         ]}]}.