summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAlvaro Videla <videlalvaro@gmail.com>2015-10-10 23:28:03 +0200
committerAlvaro Videla <videlalvaro@gmail.com>2015-10-10 23:28:03 +0200
commit1a08f21c0b6161a39628424f20b632139958975f (patch)
tree399494f549acaf9671fe9d44fb2e171457e1615b /src
parent192953364736aff37b00e17ae1952588a1cfc896 (diff)
parented516d4622d04ff79d56a9c0a303dd546f26c20f (diff)
downloadrabbitmq-server-git-1a08f21c0b6161a39628424f20b632139958975f.tar.gz
fixes conflicts
Diffstat (limited to 'src')
-rw-r--r--src/rabbit_mirror_queue_misc.erl2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/rabbit_mirror_queue_misc.erl b/src/rabbit_mirror_queue_misc.erl
index c68b799c7d..0d66cc700e 100644
--- a/src/rabbit_mirror_queue_misc.erl
+++ b/src/rabbit_mirror_queue_misc.erl
@@ -45,7 +45,7 @@
{requires, rabbit_registry},
{enables, recovery}]}).
-%% For compatibility with versions that don't support sync batching.
+
-define(DEFAULT_BATCH_SIZE, 4096).
%%----------------------------------------------------------------------------