aboutsummaryrefslogtreecommitdiffstats
path: root/lib/mnesia
diff options
context:
space:
mode:
authorHenrik Nord <[email protected]>2019-03-12 12:42:50 +0100
committerHenrik Nord <[email protected]>2019-03-12 12:42:50 +0100
commit1518224b7f955dfb8cdef04eac89d8f6df1694a1 (patch)
tree5b22a2d5896802c4fdb9be1a744a1d355cfd2686 /lib/mnesia
parent0ffc8346553a5fc9322a75d4d8be5417dad67f29 (diff)
parent620ac3e68c5bc8b36143965fcf2892a07dc005c4 (diff)
downloadotp-1518224b7f955dfb8cdef04eac89d8f6df1694a1.tar.gz
otp-1518224b7f955dfb8cdef04eac89d8f6df1694a1.tar.bz2
otp-1518224b7f955dfb8cdef04eac89d8f6df1694a1.zip
Merge branch 'maint'
* maint: Updated OTP version Prepare release
Diffstat (limited to 'lib/mnesia')
-rw-r--r--lib/mnesia/doc/src/notes.xml17
-rw-r--r--lib/mnesia/vsn.mk2
2 files changed, 17 insertions, 2 deletions
diff --git a/lib/mnesia/doc/src/notes.xml b/lib/mnesia/doc/src/notes.xml
index 8fc3610bb6..01d1666b8d 100644
--- a/lib/mnesia/doc/src/notes.xml
+++ b/lib/mnesia/doc/src/notes.xml
@@ -39,7 +39,22 @@
thus constitutes one section in this document. The title of each
section is the version number of Mnesia.</p>
- <section><title>Mnesia 4.15.5</title>
+ <section><title>Mnesia 4.15.6</title>
+
+ <section><title>Fixed Bugs and Malfunctions</title>
+ <list>
+ <item>
+ <p>
+ Avoid overload warnings caused by a race condition.</p>
+ <p>
+ Own Id: OTP-15619 Aux Id: ERIERL-310 </p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
+<section><title>Mnesia 4.15.5</title>
<section><title>Fixed Bugs and Malfunctions</title>
<list>
diff --git a/lib/mnesia/vsn.mk b/lib/mnesia/vsn.mk
index 1cfb35c774..781a4830a0 100644
--- a/lib/mnesia/vsn.mk
+++ b/lib/mnesia/vsn.mk
@@ -1 +1 @@
-MNESIA_VSN = 4.15.5
+MNESIA_VSN = 4.15.6