Mercurial > prosody-hg

comparison core/sessionmanager.lua @ 4541:05f5ec99da77

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with trunk
author Matthew Wild <mwild1@gmail.com>
date Sun, 22 Jan 2012 22:55:49 +0000
parents 2724bc4c9dff
children db27a4c18b6a
comparison
equal deleted inserted replaced
4530:40905e7bf680 4541:05f5ec99da77
14 14
15 local hosts = hosts; 15 local hosts = hosts;
16 local full_sessions = full_sessions; 16 local full_sessions = full_sessions;
17 local bare_sessions = bare_sessions; 17 local bare_sessions = bare_sessions;
18 18
19 local modulemanager = require "core.modulemanager";
20 local logger = require "util.logger"; 19 local logger = require "util.logger";
21 local log = logger.init("sessionmanager"); 20 local log = logger.init("sessionmanager");
22 local error = error; 21 local error = error;
23 local uuid_generate = require "util.uuid".generate; 22 local uuid_generate = require "util.uuid".generate;
24 local rm_load_roster = require "core.rostermanager".load_roster; 23 local rm_load_roster = require "core.rostermanager".load_roster;