prosody
cde4ef90cf3d
prosodyctl

Find changesets by keywords by author, files, the commit message, revision number or hash, or revset expression.

Software / code / prosody

Comparison

prosodyctl @ 7269:cde4ef90cf3d

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Fri, 11 Mar 2016 13:41:10 +0100
parent 7256:9fbb9fbf7e52
parent 7267:8ad2dbc4fdb6
child 7302:92d86016e1e3
comparison
equal deleted inserted replaced
7263:015a711a8ccf 7269:cde4ef90cf3d
867 end 867 end
868 if not what or what == "config" then 868 if not what or what == "config" then
869 print("Checking config..."); 869 print("Checking config...");
870 local deprecated = set.new({ 870 local deprecated = set.new({
871 "bosh_ports", "disallow_s2s", "no_daemonize", "anonymous_login", "require_encryption", 871 "bosh_ports", "disallow_s2s", "no_daemonize", "anonymous_login", "require_encryption",
872 "vcard_compatibility",
872 }); 873 });
873 local known_global_options = set.new({ 874 local known_global_options = set.new({
874 "pidfile", "log", "plugin_paths", "prosody_user", "prosody_group", "daemonize", 875 "pidfile", "log", "plugin_paths", "prosody_user", "prosody_group", "daemonize",
875 "umask", "prosodyctl_timeout", "use_ipv6", "use_libevent", "network_settings", 876 "umask", "prosodyctl_timeout", "use_ipv6", "use_libevent", "network_settings",
876 "network_backend", "http_default_host", 877 "network_backend", "http_default_host",