diff options
| author | Michael Klishin <mklishin@pivotal.io> | 2016-08-31 03:31:08 +0300 |
|---|---|---|
| committer | Michael Klishin <mklishin@pivotal.io> | 2016-08-31 03:31:08 +0300 |
| commit | 8765f2c939aefe864633e697f69878cea6802612 (patch) | |
| tree | 06ef8eec55eaff902ea2b39daa0f21cb90cb503d /docs/rabbitmq.config.example | |
| parent | c12d5a6c9a77a670614b04a64df73263d64789f7 (diff) | |
| parent | 6d9d506f453e38e1134235c57d365c91af5b6cc4 (diff) | |
| download | rabbitmq-server-git-8765f2c939aefe864633e697f69878cea6802612.tar.gz | |
Merge branch 'master' into rabbitmq-server-930
Conflicts:
src/rabbit_control_main.erl
src/rabbit_upgrade_functions.erl
Diffstat (limited to 'docs/rabbitmq.config.example')
| -rw-r--r-- | docs/rabbitmq.config.example | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/rabbitmq.config.example b/docs/rabbitmq.config.example index 08fc42a71d..bea743d679 100644 --- a/docs/rabbitmq.config.example +++ b/docs/rabbitmq.config.example @@ -161,7 +161,7 @@ %% Set the default AMQP heartbeat delay (in seconds). %% - %% {heartbeat, 600}, + %% {heartbeat, 60}, %% Set the max permissible size of an AMQP frame (in bytes). %% |