aboutsummaryrefslogtreecommitdiffstats
path: root/erts/doc
diff options
context:
space:
mode:
authorRickard Green <[email protected]>2016-12-19 14:32:56 +0100
committerRickard Green <[email protected]>2016-12-19 14:32:56 +0100
commit410d89601ba3d7ff6fb280d17d28654151a4af7c (patch)
treed0b4079916db035cf84b537bfa31a3d0d399a0df /erts/doc
parent4f4cfe837e8a2d1d68751669c0fb1bc689e30062 (diff)
parentc2e497d888456e7720bd3d4123694c444ef9072b (diff)
downloadotp-410d89601ba3d7ff6fb280d17d28654151a4af7c.tar.gz
otp-410d89601ba3d7ff6fb280d17d28654151a4af7c.tar.bz2
otp-410d89601ba3d7ff6fb280d17d28654151a4af7c.zip
Merge branch 'maint'
* maint: Remove faulty release note for these fixes New test cases testing stacktrace from apply on erlang:error() Fix stactrace for apply on error/[1,2], exit/1, or throw/1 Fix stack-trace generated by a traced process Conflicts: erts/emulator/beam/beam_emu.c erts/etc/unix/etp-commands.in
Diffstat (limited to 'erts/doc')
-rw-r--r--erts/doc/src/notes.xml7
1 files changed, 0 insertions, 7 deletions
diff --git a/erts/doc/src/notes.xml b/erts/doc/src/notes.xml
index da6190b685..11777f0014 100644
--- a/erts/doc/src/notes.xml
+++ b/erts/doc/src/notes.xml
@@ -145,13 +145,6 @@
<p>
Own Id: OTP-14051</p>
</item>
- <item>
- <p>
- Fixed a number of bugs that caused faulty stack-traces to
- be created on exception when a process was traced.</p>
- <p>
- Own Id: OTP-14055</p>
- </item>
</list>
</section>