diff options
| author | Tim Watson <watson.timothy@gmail.com> | 2014-01-10 17:07:46 +0000 |
|---|---|---|
| committer | Tim Watson <watson.timothy@gmail.com> | 2014-01-10 17:07:46 +0000 |
| commit | 8c4feedd9c119240cfe1d24977e3183edde657d7 (patch) | |
| tree | 5ceacfcd59b7a4342ecc219f17c279ef751a8f97 /ebin | |
| parent | 8b397e93f589e6c57182b76e941cc02274656885 (diff) | |
| parent | d31640186232bdab187deafdf4885aaae685df66 (diff) | |
| download | rabbitmq-server-git-8c4feedd9c119240cfe1d24977e3183edde657d7.tar.gz | |
Merge default into bug24926
Merge conflicts in rabbit.erl, pertaining to app startup procedure.
Diffstat (limited to 'ebin')
| -rw-r--r-- | ebin/rabbit_app.in | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ebin/rabbit_app.in b/ebin/rabbit_app.in index a10bad450d..29f06e7920 100644 --- a/ebin/rabbit_app.in +++ b/ebin/rabbit_app.in @@ -25,6 +25,7 @@ %% 0 ("no limit") would make a better default, but that %% breaks the QPid Java client {frame_max, 131072}, + {channel_max, 0}, {heartbeat, 580}, {msg_store_file_size_limit, 16777216}, {queue_index_max_journal_entries, 65536}, @@ -52,6 +53,7 @@ {nodelay, true}, {linger, {true, 0}}, {exit_on_close, false}]}, + {halt_on_upgrade_failure, true}, {hipe_compile, false}, %% see bug 24513 for how this list was created {hipe_modules, |