diff options
| author | Kim Alvefur <zash@zash.se> | 2016-03-11 13:41:10 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2016-03-11 13:41:10 +0100 |
| commit | c12ebaa5ce7d55c66361757d773e67b62d2e719e (patch) | |
| tree | 3731b00879faf7182108cc277a9a2c61e5fdc0d0 /prosodyctl | |
| parent | b201dabbfdf598f0d300bc9682444bd435611063 (diff) | |
| parent | 3cee8c1473a0938b58ec0ed93c266c33ec26a4a6 (diff) | |
| download | prosody-c12ebaa5ce7d55c66361757d773e67b62d2e719e.tar.gz prosody-c12ebaa5ce7d55c66361757d773e67b62d2e719e.zip | |
Merge 0.10->trunk
Diffstat (limited to 'prosodyctl')
| -rwxr-xr-x | prosodyctl | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -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", |