diff options
author | Henrik Nord <[email protected]> | 2011-10-20 14:39:42 +0200 |
---|---|---|
committer | Henrik Nord <[email protected]> | 2011-10-20 14:39:42 +0200 |
commit | 45b4d5309e0686cc5fa28506de76f75b598bbd95 (patch) | |
tree | bd4d54a6de38654f49908b38c311718b74593a33 /lib/stdlib/test/Makefile | |
parent | e21bc712b95b878afd9ab3d93ac27ded0bce7ccf (diff) | |
parent | 04731323678eff58f709b36f864d12aa08cfe6d9 (diff) | |
download | otp-45b4d5309e0686cc5fa28506de76f75b598bbd95.tar.gz otp-45b4d5309e0686cc5fa28506de76f75b598bbd95.tar.bz2 otp-45b4d5309e0686cc5fa28506de76f75b598bbd95.zip |
Merge branch 'cf/simple_one_for_one_shutdown'
* cf/simple_one_for_one_shutdown:
Explain how dynamic child processes are stopped
Stack errors when dynamic children are stopped
Explicitly kill dynamic children in supervisors
Conflicts:
lib/stdlib/doc/src/supervisor.xml
OTP-9647
Diffstat (limited to 'lib/stdlib/test/Makefile')
-rw-r--r-- | lib/stdlib/test/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/stdlib/test/Makefile b/lib/stdlib/test/Makefile index 5502c69fa5..aa6a660c34 100644 --- a/lib/stdlib/test/Makefile +++ b/lib/stdlib/test/Makefile @@ -65,6 +65,7 @@ MODULES= \ stdlib_SUITE \ string_SUITE \ supervisor_1 \ + supervisor_2 \ naughty_child \ shell_SUITE \ supervisor_SUITE \ |