summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorArnaud Cogoluègnes <acogoluegnes@gmail.com>2017-06-06 11:54:01 +0200
committerArnaud Cogoluègnes <acogoluegnes@gmail.com>2017-06-06 11:54:01 +0200
commit3000c66caebb456228030e03c2eb845c90b57d94 (patch)
treebdbc4e81255b3ea1da4f866f9964b6479655c679 /docs
parentcfcef54b08c0d86b01d28dc4d7f284e44c6bf4dc (diff)
parent5f9752ca8bbda64a3dff46afe9ea6043cce47006 (diff)
downloadrabbitmq-server-git-3000c66caebb456228030e03c2eb845c90b57d94.tar.gz
Merge remote-tracking branch 'origin' into rabbitmq-server-1229
Diffstat (limited to 'docs')
-rw-r--r--docs/rabbitmq.config.example4
1 files changed, 4 insertions, 0 deletions
diff --git a/docs/rabbitmq.config.example b/docs/rabbitmq.config.example
index a5c93fdee9..2be3c74095 100644
--- a/docs/rabbitmq.config.example
+++ b/docs/rabbitmq.config.example
@@ -246,6 +246,10 @@
%%
%% {memory_monitor_interval, 2500},
+ %% The total memory available can be calculated from the OS resources
+ %% - default option - or provided as a configuration parameter:
+ %% {total_memory_available_override_value, "5000MB"},
+
%% Set disk free limit (in bytes). Once free disk space reaches this
%% lower bound, a disk alarm will be set - see the documentation
%% listed above for more details.