summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Klishin <mklishin@pivotal.io>2016-06-05 02:24:50 +0300
committerMichael Klishin <mklishin@pivotal.io>2016-06-05 02:24:50 +0300
commit2b4df8a8382b9cd62d23165409754b54c5fab2ca (patch)
tree8bf6c94cbba155ee1041a8a32ad97c82f8512dfd
parent7e84bc3ae8be80157e8a42660d9c46db3f2c073b (diff)
parent4edec0969fa31c26e9c6020ad1bab33a0491f292 (diff)
downloadrabbitmq-server-git-2b4df8a8382b9cd62d23165409754b54c5fab2ca.tar.gz
Merge branch 'stable'
-rw-r--r--src/rabbit_amqqueue_process.erl4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/rabbit_amqqueue_process.erl b/src/rabbit_amqqueue_process.erl
index 5535a84fca..d9724e0012 100644
--- a/src/rabbit_amqqueue_process.erl
+++ b/src/rabbit_amqqueue_process.erl
@@ -80,6 +80,10 @@
max_length,
%% max length in bytes, if configured
max_bytes,
+ %% when policies change, this version helps queue
+ %% determine what previously scheduled/set up state to ignore,
+ %% e.g. message expiration messages from previously set up timers
+ %% that may or may not be still valid
args_policy_version,
%% used to discard outdated/superseded policy updates,
%% e.g. when policies are applied concurrently. See