Diff

prosodyctl @ 6722:d022cb4486bd

Merge 0.10->trunk
author Matthew Wild <mwild1@gmail.com>
date Tue, 19 May 2015 09:31:12 +0100
parent 6711:76683a3f3d75
child 6751:18f18bceb662
line wrap: on
line diff
--- a/prosodyctl	Fri May 15 15:33:31 2015 +0200
+++ b/prosodyctl	Tue May 19 09:31:12 2015 +0100
@@ -578,6 +578,8 @@
 	print("");
 	print("# Lua module versions");
 	local module_versions, longest_name = {}, 8;
+	local luaevent =dependencies.softreq"luaevent";
+	local ssl = dependencies.softreq"ssl";
 	for name, module in pairs(package.loaded) do
 		if type(module) == "table" and rawget(module, "_VERSION")
 		and name ~= "_G" and not name:match("%.") then