Merge branch 'stable'

2 files changed, 23 insertions, 1 deletions

diff --git a/ebin/rabbit_app.in b/ebin/rabbit_app.in
index d9da66c812..fa70058930 100644
--- a/ebin/rabbit_app.in
+++ b/ebin/rabbit_app.in
@@ -86,7 +86,13 @@
          {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}
         ]}]}.
diff --git a/src/rabbit_queue_decorator.erl b/src/rabbit_queue_decorator.erl
index adfe0c7fae..129f51d099 100644
--- a/src/rabbit_queue_decorator.erl
+++ b/src/rabbit_queue_decorator.erl
@@ -1,3 +1,19 @@
+%% The contents of this file are subject to the Mozilla Public License
+%% Version 1.1 (the "License"); you may not use this file except in
+%% compliance with the License. You may obtain a copy of the License
+%% at http://www.mozilla.org/MPL/
+%%
+%% Software distributed under the License is distributed on an "AS IS"
+%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+%% the License for the specific language governing rights and
+%% limitations under the License.
+%%
+%% The Original Code is RabbitMQ.
+%%
+%% The Initial Developer of the Original Code is GoPivotal, Inc.
+%% Copyright (c) 2007-2015 Pivotal Software, Inc.  All rights reserved.
+%%
+
 -module(rabbit_queue_decorator).
 
 -include("rabbit.hrl").