aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2018-12-17 15:42:54 +0100
committerKim Alvefur <zash@zash.se>2018-12-17 15:42:54 +0100
commit5a5eaeb30c4d75294fb4697d483c379421e024d5 (patch)
treef2cce570497aa822c6eb077eb9597b810671ebb6
parent9aee66a6c5ee1754afd603b14c7109c2b13db542 (diff)
parent5b1f1dd9b3f3ecd76e99249cfe979217a2a213f2 (diff)
downloadprosody-5a5eaeb30c4d75294fb4697d483c379421e024d5.tar.gz
prosody-5a5eaeb30c4d75294fb4697d483c379421e024d5.zip
Merge 0.11->trunk
-rwxr-xr-xprosodyctl1
1 files changed, 1 insertions, 0 deletions
diff --git a/prosodyctl b/prosodyctl
index 9a30ce30..76de45a2 100755
--- a/prosodyctl
+++ b/prosodyctl
@@ -812,6 +812,7 @@ function commands.check(arg)
"pidfile", "log", "plugin_paths", "prosody_user", "prosody_group", "daemonize",
"umask", "prosodyctl_timeout", "use_ipv6", "use_libevent", "network_settings",
"network_backend", "http_default_host",
+ "statistics_interval", "statistics", "statistics_config",
});
local config = configmanager.getconfig();
-- Check that we have any global options (caused by putting a host at the top)