aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2018-11-12 22:51:30 +0100
committerKim Alvefur <zash@zash.se>2018-11-12 22:51:30 +0100
commitb41ff3079c09d77011cd6e2b4da9604828860e93 (patch)
treec6f5451fac4f2403e1c185bbff2eb25f107395e0
parenta4ef4fcfa54091d1c57111f3fa9c79ce496f63fd (diff)
parent516ff740353c7428688f056ce9a237e5a9d1c731 (diff)
downloadprosody-b41ff3079c09d77011cd6e2b4da9604828860e93.tar.gz
prosody-b41ff3079c09d77011cd6e2b4da9604828860e93.zip
Merge 0.11->trunk
-rw-r--r--spec/scansion/prosody.cfg.lua4
1 files changed, 3 insertions, 1 deletions
diff --git a/spec/scansion/prosody.cfg.lua b/spec/scansion/prosody.cfg.lua
index a6e8d289..94861449 100644
--- a/spec/scansion/prosody.cfg.lua
+++ b/spec/scansion/prosody.cfg.lua
@@ -42,7 +42,9 @@ modules_enabled = {
--"motd"; -- Send a message to users when they log in
--"legacyauth"; -- Legacy authentication. Only used by some old clients and bots.
--"proxy65"; -- Enables a file transfer proxy service which clients behind NAT can use
- --"scansion_record";
+
+ -- Useful for testing
+ --"scansion_record"; -- Records things that happen in scansion test case format
}
certificate = "certs"