diff options
| author | Michael Klishin <mklishin@pivotal.io> | 2016-10-14 07:32:40 +0800 |
|---|---|---|
| committer | Michael Klishin <mklishin@pivotal.io> | 2016-10-14 07:32:40 +0800 |
| commit | 0454457f4ef429d6b9d0337aa43fa738da3b5d72 (patch) | |
| tree | c6c8acb02f6e9b1dfc017ad90782f4b56f948ab6 /docs | |
| parent | 45c728a4a5b637521a17f0472ed29a2a4187763a (diff) | |
| parent | fdd9f295d8b33a0774b3fa1f9753ff044fcfee15 (diff) | |
| download | rabbitmq-server-git-0454457f4ef429d6b9d0337aa43fa738da3b5d72.tar.gz | |
Merge branch 'master' into rabbitmq-server-486
Conflicts:
src/rabbit.app.src
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/rabbitmq.conf.example | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/docs/rabbitmq.conf.example b/docs/rabbitmq.conf.example index 7e60c53da4..f03145b447 100644 --- a/docs/rabbitmq.conf.example +++ b/docs/rabbitmq.conf.example @@ -307,14 +307,14 @@ ## See http://www.rabbitmq.com/clustering.html#auto-config for ## further details. ## -# cluster_nodes.disc.rabbit = rabbit@my.host.com - -## You can define multiple nodes -# cluster_nodes.disc.hare = hare@my.host.com - -## There can be also ram nodes. -## Ram nodes should not be defined together with disk nodes -# cluster_nodes.ram.rabbit = rabbit@my.host.com +# autocluster.classic_config.nodes.node1 = rabbit1@hostname +# autocluster.classic_config.nodes.node2 = rabbit2@hostname +# autocluster.classic_config.nodes.node3 = rabbit3@hostname +# autocluster.classic_config.nodes.node4 = rabbit4@hostname + +## This node's type can be configured. If you are not sure +## what node type to use, always use 'disc'. +# autocluster.classic_config.node_type = disc ## Interval (in milliseconds) at which we send keepalive messages ## to other cluster members. Note that this is not the same thing |