Mercurial > prosody-hg

comparison core/hostmanager.lua @ 6557:8aa967c81cbc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge 0.10->trunk
author Matthew Wild <mwild1@gmail.com>
date Wed, 21 Jan 2015 01:29:00 +0000
parents ceaf2a0d05eb a10c9d6825a4
children 352fa2cae1c9
comparison
equal deleted inserted replaced
6543:01cd51777abb 6557:8aa967c81cbc
11 local events_new = require "util.events".new; 11 local events_new = require "util.events".new;
12 local disco_items = require "util.multitable".new(); 12 local disco_items = require "util.multitable".new();
13 local NULL = {}; 13 local NULL = {};
14 14
15 local jid_split = require "util.jid".split; 15 local jid_split = require "util.jid".split;
16 local uuid_gen = require "util.uuid".generate;
17 16
18 local log = require "util.logger".init("hostmanager"); 17 local log = require "util.logger".init("hostmanager");
19 18
20 local hosts = prosody.hosts; 19 local hosts = prosody.hosts;
21 local prosody_events = prosody.events; 20 local prosody_events = prosody.events;