Merge branch 'master' into rabbitmq-server-270

1 files changed, 10 insertions, 4 deletions

diff --git a/ebin/rabbit_app.in b/ebin/rabbit_app.in
index cd3516d32c..7c4be6f7f2 100644
--- a/ebin/rabbit_app.in
+++ b/ebin/rabbit_app.in
@@ -85,9 +85,15 @@
          {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
+         %% 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
+         %% are embedded on the queue index, then modifying this
+         %% 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_io_batch_size, 2048}
+         {msg_store_io_batch_size, 2048},
+         %% see rabbitmq-server#143
+         {credit_flow_default_credit, {200, 50}}
         ]}]}.