summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorMichael Klishin <michael@novemberain.com>2017-02-10 03:00:22 +0300
committerGitHub <noreply@github.com>2017-02-10 03:00:22 +0300
commitc965682e8a573855978ca3b9108a305baf5c1953 (patch)
tree1e84d1b8ce3985a3119e0fac7df01d5c0299ec0d /Makefile
parente43347914b08677c4ca229c3ded5aceca3e405d4 (diff)
parentbbce05cf1b33a94aef2a36133c799eaeed9d4280 (diff)
downloadrabbitmq-server-git-c965682e8a573855978ca3b9108a305baf5c1953.tar.gz
Merge pull request #1095 from rabbitmq/rabbitmq-server-589
Support proxy protocol
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 3 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index f1e487fdcf..6d808adaf0 100644
--- a/Makefile
+++ b/Makefile
@@ -113,7 +113,9 @@ define PROJECT_ENV
{queue_explicit_gc_run_operation_threshold, 1000},
{lazy_queue_explicit_gc_run_operation_threshold, 1000},
{background_gc_enabled, false},
- {background_gc_target_interval, 60000}
+ {background_gc_target_interval, 60000},
+ %% rabbitmq-server-589
+ {proxy_protocol, false}
]
endef