# HG changeset patch # User Kim Alvefur <zash@zash.se> # Date 1545057774 -3600 # Node ID 8649a6b010e292cae2654f4f4fc8d1ff49ebc9ec # Parent 6507df6d2c559eab0e1bad6f8645fc1101d8c65f# Parent f31ed70c993adcb43808720d110e69c2b7b228b6 Merge 0.11->trunk diff -r 6507df6d2c55 -r 8649a6b010e2 prosodyctl --- 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)