aboutsummaryrefslogtreecommitdiffstats
path: root/lib/mnesia
diff options
context:
space:
mode:
authorMagnus Lidén <[email protected]>2013-12-10 14:31:40 +0100
committerMagnus Lidén <[email protected]>2013-12-10 14:31:40 +0100
commit458e302f61e2de36ebd49c5a5a5b984224bdce94 (patch)
tree0eaff569e08f2cd170275fb38eff8e56993ae47d /lib/mnesia
parent6d22d78204ca8bc8ed4beb92f6021ff3ba93a882 (diff)
parent25237481ccccd3ddfa74582dc267632ad618ba30 (diff)
downloadotp-458e302f61e2de36ebd49c5a5a5b984224bdce94.tar.gz
otp-458e302f61e2de36ebd49c5a5a5b984224bdce94.tar.bz2
otp-458e302f61e2de36ebd49c5a5a5b984224bdce94.zip
Merge tag 'OTP_R16B03'
The R16B03 release Conflicts: lib/sasl/vsn.mk
Diffstat (limited to 'lib/mnesia')
-rw-r--r--lib/mnesia/doc/src/notes.xml26
-rw-r--r--lib/mnesia/vsn.mk2
2 files changed, 26 insertions, 2 deletions
diff --git a/lib/mnesia/doc/src/notes.xml b/lib/mnesia/doc/src/notes.xml
index da66a647f5..0e9131190d 100644
--- a/lib/mnesia/doc/src/notes.xml
+++ b/lib/mnesia/doc/src/notes.xml
@@ -38,7 +38,31 @@
thus constitutes one section in this document. The title of each
section is the version number of Mnesia.</p>
- <section><title>Mnesia 4.10</title>
+ <section><title>Mnesia 4.11</title>
+
+ <section><title>Fixed Bugs and Malfunctions</title>
+ <list>
+ <item>
+ <p>
+ Fixed a race in mnesia which could cause hanging
+ transaction when sticky locks had been used. Thanks
+ janchochol.</p>
+ <p>
+ Own Id: OTP-11375</p>
+ </item>
+ <item>
+ <p>
+ Fixed dirty_update_counter which could return ok, thanks
+ Anton Ryabkov.</p>
+ <p>
+ Own Id: OTP-11485</p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
+<section><title>Mnesia 4.10</title>
<section><title>Fixed Bugs and Malfunctions</title>
<list>
diff --git a/lib/mnesia/vsn.mk b/lib/mnesia/vsn.mk
index c8187013be..064ba43791 100644
--- a/lib/mnesia/vsn.mk
+++ b/lib/mnesia/vsn.mk
@@ -1 +1 @@
-MNESIA_VSN = 4.10
+MNESIA_VSN = 4.11