Software / code / prosody
Changeset
11587:ce7c52a6d650
Merge 0.11->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Thu, 27 May 2021 12:51:07 +0200 |
| parents | 11585:057ce005937e (current diff) 11586:35e880501efd (diff) |
| children | 11588:1d59fd55d2f6 |
| files | prosodyctl util/prosodyctl/check.lua |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/util/prosodyctl/check.lua Thu May 27 11:18:42 2021 +0200 +++ b/util/prosodyctl/check.lua Thu May 27 12:51:07 2021 +0200 @@ -47,7 +47,7 @@ "umask", "prosodyctl_timeout", "use_ipv6", "use_libevent", "network_settings", "network_backend", "http_default_host", "statistics_interval", "statistics", "statistics_config", - "plugin_server", "installer_plugin_path", "gc" + "plugin_server", "installer_plugin_path", "gc", "limits", }); local config = configmanager.getconfig(); -- Check that we have any global options (caused by putting a host at the top)
