Software / code / prosody
Changeset
7679:589e27b47d56
Merge 0.9->0.10
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Wed, 28 Sep 2016 14:45:02 +0200 |
| parents | 7674:8027eecc750f (current diff) 7678:99abf5a5d8d3 (diff) |
| children | 7680:47be42c9eea3 |
| files | plugins/mod_s2s/mod_s2s.lua prosodyctl util/dependencies.lua |
| diffstat | 3 files changed, 4 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Sat Sep 24 18:31:16 2016 +0200 +++ b/.hgtags Wed Sep 28 14:45:02 2016 +0200 @@ -58,3 +58,4 @@ b1c84d220c409b7b17cd41e850576db253406b0a 0.9.8 7ec52755622f1009aaf7b02fc9bc91e8ad9974be 0.9.9 352270bc04393910a567b569ede03358dbb728b5 0.9.10 +8613086779fa9276615c2af066d2a10c38d0c86e 0.9.11
--- a/plugins/mod_s2s/mod_s2s.lua Sat Sep 24 18:31:16 2016 +0200 +++ b/plugins/mod_s2s/mod_s2s.lua Wed Sep 28 14:45:02 2016 +0200 @@ -373,7 +373,7 @@ elseif session.direction == "outgoing" then session.notopen = nil; if not attr.id then - log("error", "Stream response from %s did not give us a stream id!", session.to_host); + log("warn", "Stream response did not give us a stream id!"); session:close({ condition = "undefined-condition", text = "Missing stream ID" }); return; end
--- a/prosodyctl Sat Sep 24 18:31:16 2016 +0200 +++ b/prosodyctl Wed Sep 28 14:45:02 2016 +0200 @@ -364,8 +364,8 @@ end local user, host = jid_split(arg[1]); if not user and host then - show_message [[Failed to understand JID, please supply the JID you want to set the password for]] - show_usage [[passwd user@host]] + show_message [[Failed to understand JID, please supply the JID to the user account you want to delete]] + show_usage [[deluser user@host]] return 1; end
