# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1622112667 -7200
# Node ID ce7c52a6d650b9f548392f6a842e468e7c7d9f88
# Parent  057ce005937e16347b5e062d48519dac4fb913c7# Parent  35e880501efdedd4758061f1707f585b083352c2
Merge 0.11->trunk

diff -r 057ce005937e -r ce7c52a6d650 prosodyctl
diff -r 057ce005937e -r ce7c52a6d650 util/prosodyctl/check.lua
--- 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)