← Back to branch summary

~ubuntu-branches/ubuntu/lucid/erlang/lucid-proposed

« back to all changes in this revision

Viewing changes to lib/ssh/src/ssh_subsystem_sup.erl

  • Committer: Bazaar Package Importer
  • Author(s): Sergei Golovan
  • Date: 2009-06-11 12:18:07 UTC
  • mfrom: (1.2.2 upstream)
  • Revision ID: james.westby@ubuntu.com-20090611121807-ks7eb4xrt7dsysgx
Tags: 1:13.b.1-dfsg-1
http://bugs.debian.org/529512
* New upstream release.
* Removed unnecessary dependency of erlang-os-mon on erlang-observer and
  erlang-tools and added missing dependency of erlang-nox on erlang-os-mon
  (closes: #529512).
* Removed a patch to eunit application because the bug was fixed upstream.

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/ssh/src/ssh_subsystem_sup.erl
16
16
%% 
17
17
%% %CopyrightEnd%
18
18
%%
19
 
 
20
19
%%
21
20
%%----------------------------------------------------------------------
22
21
%% Purpose: The ssh subsystem supervisor 
73
72
    Role = proplists:get_value(role, Opts),
74
73
    Name = id(Role, ssh_connection_sup, Address, Port),
75
74
    StartFunc = {ssh_connection_sup, start_link, [Opts]},
76
 
    Restart = permanent, 
 
75
    Restart = transient, 
 
76
%    Restart = permanent, 
77
77
    Shutdown = infinity,
78
78
    Modules = [ssh_connection_sup],
79
79
    Type = supervisor,
85
85
    Role = proplists:get_value(role, Opts),
86
86
    Name = id(Role, ssh_channel_sup, Address, Port),
87
87
    StartFunc = {ssh_channel_sup, start_link, [Opts]},
88
 
    Restart = permanent, 
 
88
    Restart = transient, 
 
89
%    Restart = permanent, 
89
90
    Shutdown = infinity,
90
91
    Modules = [ssh_channel_sup],
91
92
    Type = supervisor,