prosody
df4f52cabdfe
prosodyctl

Find changesets by keywords by author, files, the commit message, revision number or hash, or revset expression.

Software / code / prosody

Comparison

prosodyctl @ 7191:df4f52cabdfe

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Wed, 24 Feb 2016 11:20:00 +0100
parent 7147:81e54032d14d
parent 7190:7a14ea196db3
child 7195:39b7ea9141c0
comparison
equal deleted inserted replaced
7188:e8f20be3e6f8 7191:df4f52cabdfe
231 local function make_host(hostname) 231 local function make_host(hostname)
232 return { 232 return {
233 type = "local", 233 type = "local",
234 events = prosody.events, 234 events = prosody.events,
235 modules = {}, 235 modules = {},
236 sessions = {},
236 users = require "core.usermanager".new_null_provider(hostname) 237 users = require "core.usermanager".new_null_provider(hostname)
237 }; 238 };
238 end 239 end
239 240
240 for hostname, config in pairs(config.getconfig()) do 241 for hostname, config in pairs(config.getconfig()) do