Merge 0.11->trunk
authorKim Alvefur <zash@zash.se>
Mon, 17 Dec 2018 15:42:54 +0100
changeset 9714 8649a6b010e2
parent 9712 6507df6d2c55 (current diff)
parent 9713 f31ed70c993a (diff)
child 9715 39dc037875e1
Merge 0.11->trunk
--- a/prosodyctl	Sun Dec 16 22:59:14 2018 +0100
+++ b/prosodyctl	Mon Dec 17 15:42:54 2018 +0100
@@ -812,6 +812,7 @@
 			"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)