Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Mon, 07 Mar 2016 16:48:28 +0100
changeset 7254 b74421fe417a
parent 7251 5e1fe4f0eb9c (current diff)
parent 7253 6ffc9247417a (diff)
child 7258 3da7c334f034
Merge 0.10->trunk
prosodyctl
--- a/prosodyctl	Mon Mar 07 13:43:05 2016 +0000
+++ b/prosodyctl	Mon Mar 07 16:48:28 2016 +0100
@@ -590,8 +590,11 @@
 			module_versions[name] = module._VERSION;
 		end
 	end
+	if luaevent then
+		module_versions["libevent"] = luaevent.core.libevent_version();
+	end
 	local sorted_keys = array.collect(keys(module_versions)):sort();
-	for _, name in ipairs(array.collect(keys(module_versions)):sort()) do
+	for _, name in ipairs(sorted_keys) do
 		print(name..":"..string.rep(" ", longest_name-#name), module_versions[name]);
 	end
 	print("");