Merge 0.10->trunk

This commit is contained in:
Kim Alvefur 2016-03-11 13:41:10 +01:00
commit 36c4899e39
4 changed files with 5 additions and 4 deletions

View file

@ -869,6 +869,7 @@ function commands.check(arg)
print("Checking config...");
local deprecated = set.new({
"bosh_ports", "disallow_s2s", "no_daemonize", "anonymous_login", "require_encryption",
"vcard_compatibility",
});
local known_global_options = set.new({
"pidfile", "log", "plugin_paths", "prosody_user", "prosody_group", "daemonize",