prosody
a86efd60425f
prosodyctl

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

Software / code / prosody

Comparison

prosodyctl @ 5143:a86efd60425f

Merge 0.9->trunk
author Waqas Hussain <waqas20@gmail.com>
date Sun, 23 Sep 2012 01:13:08 +0500
parent 5141:9ca67015ba0e
parent 5142:3221746f4769
child 5160:da7fe5de82fb
comparison
equal deleted inserted replaced
5141:9ca67015ba0e 5143:a86efd60425f
225 225
226 local function make_host(hostname) 226 local function make_host(hostname)
227 return { 227 return {
228 type = "local", 228 type = "local",
229 events = prosody.events, 229 events = prosody.events,
230 modules = {},
230 users = require "core.usermanager".new_null_provider(hostname) 231 users = require "core.usermanager".new_null_provider(hostname)
231 }; 232 };
232 end 233 end
233 234
234 for hostname, config in pairs(config.getconfig()) do 235 for hostname, config in pairs(config.getconfig()) do