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 | 36c4899e39311d14b66188a9b8af1a577ebc7f61 (patch) | |
| tree | 3731b00879faf7182108cc277a9a2c61e5fdc0d0 /prosodyctl | |
| parent | 96bfdd66ff021279115716c0640539e97739f51e (diff) | |
| parent | e1769afc17d978417c95f944ac757ed45b319d92 (diff) | |
| download | prosody-36c4899e39311d14b66188a9b8af1a577ebc7f61.tar.gz prosody-36c4899e39311d14b66188a9b8af1a577ebc7f61.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", |