~ubuntu-branches/ubuntu/trusty/ejabberd/trusty-proposed

« back to all changes in this revision

Viewing changes to src/ejabberd_sup.erl

  • Committer: Bazaar Package Importer
  • Author(s): Konstantin Khomoutov
  • Date: 2010-12-14 17:45:08 UTC
  • mfrom: (1.1.17 upstream)
  • Revision ID: james.westby@ubuntu.com-20101214174508-6vgu3uw3ki6x8vj2
Tags: 2.1.6-1
* New upstream release.
* Remove obsolete patches.
* Update mod_admin_extra to revision 1106.
* Conflict with ejabberd-mod-shared-roster-ldap which is now included.

Show diffs side-by-side

added added

removed removed

Lines of Context:
177
177
         infinity,
178
178
         supervisor,
179
179
         [ejabberd_tmp_sup]},
 
180
    CacheTabSupervisor =
 
181
        {cache_tab_sup,
 
182
         {cache_tab_sup, start_link, []},
 
183
         permanent,
 
184
         infinity,
 
185
         supervisor,
 
186
         [cache_tab_sup]},
180
187
    {ok, {{one_for_one, 10, 1},
181
188
          [Hooks,
182
189
           NodeGroups,
196
203
           IQSupervisor,
197
204
           STUNSupervisor,
198
205
           FrontendSocketSupervisor,
 
206
           CacheTabSupervisor,
199
207
           Listener]}}.
200
208
 
201
209