Software / code / prosody
Diff
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 |
line wrap: on
line diff
--- a/prosodyctl Thu Mar 10 17:55:40 2016 +0000 +++ b/prosodyctl Fri Mar 11 13:41:10 2016 +0100 @@ -869,6 +869,7 @@ 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",
