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
commit273523a27617d2b320a811c0e978111ae3d6e23b (patch)
treef2cce570497aa822c6eb077eb9597b810671ebb6
parent24a020bbaa7d9d99d26330e2639f9249511f84cd (diff)
parent59c09fa60424dfe11e784896519c2a81a814437e (diff)
downloadprosody-273523a27617d2b320a811c0e978111ae3d6e23b.tar.gz
prosody-273523a27617d2b320a811c0e978111ae3d6e23b.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)