aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorMicael Karlberg <[email protected]>2011-09-23 16:30:14 +0200
committerMicael Karlberg <[email protected]>2011-09-23 16:30:14 +0200
commit0738421651e4997c1cfc29f2f90b2792bb3a42d6 (patch)
tree7840463982d9f4b5fb6aba46c4004ee906e3ac81 /lib
parent55bb3e1faf613c51ec59c9ee7ab4b4e967f30fda (diff)
parent9c686fc1fc0628549af91b84866b824e9a3f5f15 (diff)
downloadotp-0738421651e4997c1cfc29f2f90b2792bb3a42d6.tar.gz
otp-0738421651e4997c1cfc29f2f90b2792bb3a42d6.tar.bz2
otp-0738421651e4997c1cfc29f2f90b2792bb3a42d6.zip
Merge branch 'bmk/megaco/fix_version_and_notes/OTP-9550' into dev
Diffstat (limited to 'lib')
-rw-r--r--lib/megaco/doc/src/notes.xml42
-rw-r--r--lib/megaco/src/app/megaco.appup.src11
-rw-r--r--lib/megaco/vsn.mk2
3 files changed, 54 insertions, 1 deletions
diff --git a/lib/megaco/doc/src/notes.xml b/lib/megaco/doc/src/notes.xml
index 4f678a2a1b..2aba8db71b 100644
--- a/lib/megaco/doc/src/notes.xml
+++ b/lib/megaco/doc/src/notes.xml
@@ -36,6 +36,48 @@
section is the version number of Megaco.</p>
+ <section><title>Megaco 3.15.1.1</title>
+
+ <p>Version 3.15.1.1 supports code replacement in runtime from/to
+ version 3.15.1 and 3.15.</p>
+
+ <section>
+ <title>Improvements and new features</title>
+
+<!--
+ <p>-</p>
+-->
+
+ <list type="bulleted">
+ <item>
+ <p>Correct various XML errors. </p>
+ <p>Own Id: OTP-9550</p>
+ </item>
+
+ </list>
+
+ </section>
+
+ <section>
+ <title>Fixed bugs and malfunctions</title>
+
+ <p>-</p>
+
+ <!--
+ <list type="bulleted">
+ <item>
+ <p>Fixing miscellaneous things detected by dialyzer. </p>
+ <p>Own Id: OTP-9075</p>
+ </item>
+
+ </list>
+ -->
+
+ </section>
+
+ </section> <!-- 3.15.1.1 -->
+
+
<section><title>Megaco 3.15.1</title>
<p>Version 3.15.1 supports code replacement in runtime from/to
diff --git a/lib/megaco/src/app/megaco.appup.src b/lib/megaco/src/app/megaco.appup.src
index 01b070d79f..7107178d1a 100644
--- a/lib/megaco/src/app/megaco.appup.src
+++ b/lib/megaco/src/app/megaco.appup.src
@@ -136,10 +136,17 @@
%% |
%% v
%% 3.15.1
+%% |
+%% v
+%% 3.15.1.1
%%
%%
{"%VSN%",
[
+ {"3.15.1",
+ [
+ ]
+ },
{"3.15",
[
{load_module, megaco_flex_scanner, soft_purge, soft_purge, []},
@@ -153,6 +160,10 @@
}
],
[
+ {"3.15.1",
+ [
+ ]
+ },
{"3.15",
[
{load_module, megaco_flex_scanner, soft_purge, soft_purge, []},
diff --git a/lib/megaco/vsn.mk b/lib/megaco/vsn.mk
index 5f71712360..c1476488ca 100644
--- a/lib/megaco/vsn.mk
+++ b/lib/megaco/vsn.mk
@@ -18,6 +18,6 @@
# %CopyrightEnd%
APPLICATION = megaco
-MEGACO_VSN = 3.15.1
+MEGACO_VSN = 3.15.1.1
PRE_VSN =
APP_VSN = "$(APPLICATION)-$(MEGACO_VSN)$(PRE_VSN)"