aboutsummaryrefslogtreecommitdiffstats
path: root/erts/doc
diff options
context:
space:
mode:
authorMagnus Lidén <[email protected]>2014-07-02 09:42:19 +0200
committerMagnus Lidén <[email protected]>2014-07-02 09:42:19 +0200
commitfbc5f26d8f00277aca13fd97a0eef2423446c249 (patch)
tree2128e7a886d14c27f05bd63af068f875b6f839ef /erts/doc
parentd2ade9b27432a1f7342e231d0d8b12467c3d3d77 (diff)
parenta7176f9186ffd7eb2b26daca2264d425383cf6a7 (diff)
downloadotp-fbc5f26d8f00277aca13fd97a0eef2423446c249.tar.gz
otp-fbc5f26d8f00277aca13fd97a0eef2423446c249.tar.bz2
otp-fbc5f26d8f00277aca13fd97a0eef2423446c249.zip
Merge branch 'maint-17' into maint
Diffstat (limited to 'erts/doc')
-rw-r--r--erts/doc/src/notes.xml17
1 files changed, 17 insertions, 0 deletions
diff --git a/erts/doc/src/notes.xml b/erts/doc/src/notes.xml
index 68875fe56f..5f39822712 100644
--- a/erts/doc/src/notes.xml
+++ b/erts/doc/src/notes.xml
@@ -30,6 +30,23 @@
</header>
<p>This document describes the changes made to the ERTS application.</p>
+<section><title>Erts 6.1.1</title>
+
+ <section><title>Fixed Bugs and Malfunctions</title>
+ <list>
+ <item>
+ <p>
+ Fixed ETHR_FORCE_INLINE which caused the build to break
+ on some platforms without adequate thread support
+ (VxWorks).</p>
+ <p>
+ Own Id: OTP-12010</p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
<section><title>Erts 6.1</title>
<section><title>Fixed Bugs and Malfunctions</title>