diff options
| author | Arnaud Cogoluègnes <acogoluegnes@gmail.com> | 2017-06-06 11:54:01 +0200 |
|---|---|---|
| committer | Arnaud Cogoluègnes <acogoluegnes@gmail.com> | 2017-06-06 11:54:01 +0200 |
| commit | 3000c66caebb456228030e03c2eb845c90b57d94 (patch) | |
| tree | bdbc4e81255b3ea1da4f866f9964b6479655c679 /Makefile | |
| parent | cfcef54b08c0d86b01d28dc4d7f284e44c6bf4dc (diff) | |
| parent | 5f9752ca8bbda64a3dff46afe9ea6043cce47006 (diff) | |
| download | rabbitmq-server-git-3000c66caebb456228030e03c2eb845c90b57d94.tar.gz | |
Merge remote-tracking branch 'origin' into rabbitmq-server-1229
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}}, |