diff options
| author | Michael Klishin <mklishin@pivotal.io> | 2017-04-12 14:29:25 +0300 |
|---|---|---|
| committer | Michael Klishin <mklishin@pivotal.io> | 2017-04-12 14:29:25 +0300 |
| commit | c4519ddf4baf8af772b8b1a79945eef02cda17f4 (patch) | |
| tree | 50d9a76e254c61f6b13eb8afe3e20a0fb4dd8677 /Makefile | |
| parent | 536674232015587befed5be325bc89aeca3c17ff (diff) | |
| parent | bafb80126c539e8d3c745622fbc5bebe8197439c (diff) | |
| download | rabbitmq-server-git-c4519ddf4baf8af772b8b1a79945eef02cda17f4.tar.gz | |
Merge branch 'stable'
Conflicts:
Makefile
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -115,7 +115,9 @@ define PROJECT_ENV {background_gc_enabled, false}, {background_gc_target_interval, 60000}, %% rabbitmq-server-589 - {proxy_protocol, false} + {proxy_protocol, false}, + {disk_monitor_failure_retries, 10}, + {disk_monitor_failure_retry_interval, 120000} ] endef |