diff options
| author | Michael Klishin <mklishin@pivotal.io> | 2017-05-27 00:46:01 +0300 |
|---|---|---|
| committer | Michael Klishin <mklishin@pivotal.io> | 2017-05-27 00:46:01 +0300 |
| commit | 10fd03dbf2168aed1cb7e96da7c3603444f1e449 (patch) | |
| tree | b51a5a2def3550732a072013aa79dbd6f8e1d5d2 /Makefile | |
| parent | f8dbf368bc358ad0ac889354f4fc2cfd1942d96f (diff) | |
| parent | 8bf65e52fc2e5a6242197f8364d2ec0dd3b60145 (diff) | |
| download | rabbitmq-server-git-10fd03dbf2168aed1cb7e96da7c3603444f1e449.tar.gz | |
Merge branch 'master' into rabbitmq-common-198
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -99,7 +99,9 @@ define PROJECT_ENV {channel_operation_timeout, 15000}, %% see rabbitmq-server#486 - {peer_discovery_backend, rabbit_peer_discovery_classic_config}, + {autocluster, + [{peer_discovery_backend, rabbit_peer_discovery_classic_config}] + }, %% used by rabbit_peer_discovery_classic_config {cluster_nodes, {[], disc}}, |