diff options
| author | Henrik Nord <[email protected]> | 2011-09-20 10:28:00 +0200 |
|---|---|---|
| committer | Henrik Nord <[email protected]> | 2011-09-20 10:28:13 +0200 |
| commit | 7973451a3c9fbdeef47a94ed45b65b59422abe57 (patch) | |
| tree | 4e8eccdbd551599b9654448aef87bea7bfc47355 /lib/sasl/test/release_handler_SUITE_data/release_handler_timeouts/dummy-0.1/src/dummy_sup_2.erl | |
| parent | deff4ce66e8d2a3697e0aa9d27211ee2f2a7e620 (diff) | |
| parent | feecf39417a1a5f2114a5fc18c7e0207fb642eee (diff) | |
| download | otp-7973451a3c9fbdeef47a94ed45b65b59422abe57.tar.gz otp-7973451a3c9fbdeef47a94ed45b65b59422abe57.tar.bz2 otp-7973451a3c9fbdeef47a94ed45b65b59422abe57.zip | |
Merge branch 'jw/release_handler_1' into dev
* jw/release_handler_1:
General improvements to release_handler_1:get_supervised_procs
Conflicts:
lib/sasl/src/release_handler_1.erl
lib/sasl/test/release_handler_SUITE.erl
OTP-9546
Diffstat (limited to 'lib/sasl/test/release_handler_SUITE_data/release_handler_timeouts/dummy-0.1/src/dummy_sup_2.erl')
| -rw-r--r-- | lib/sasl/test/release_handler_SUITE_data/release_handler_timeouts/dummy-0.1/src/dummy_sup_2.erl | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/lib/sasl/test/release_handler_SUITE_data/release_handler_timeouts/dummy-0.1/src/dummy_sup_2.erl b/lib/sasl/test/release_handler_SUITE_data/release_handler_timeouts/dummy-0.1/src/dummy_sup_2.erl new file mode 100644 index 0000000000..d936cbcbd6 --- /dev/null +++ b/lib/sasl/test/release_handler_SUITE_data/release_handler_timeouts/dummy-0.1/src/dummy_sup_2.erl @@ -0,0 +1,15 @@ +-module(dummy_sup_2). +-behaviour(supervisor). + +-export([start_link/0]). +-export([init/1]). + +start_link() -> + supervisor:start_link({local, ?MODULE}, ?MODULE, []). + +init([]) -> + Dummy = {dummy_server, + {dummy_server, start_link, []}, + permanent, 5000, worker, [dummy_server]}, + + {ok, {{one_for_one, 10, 10}, [Dummy]}}. |