aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorAnders Svensson <[email protected]>2013-09-13 14:44:45 +0200
committerAnders Svensson <[email protected]>2013-09-13 14:44:45 +0200
commit9f0460e88a8db944a838991a238568c96e291ae6 (patch)
tree2576bdacdb86a67e659bc0359b22ed806c5a446e /lib
parent40d72d3c54e7a92e0a86ded57907281f7e16e7f4 (diff)
parent18596122b1a330853cb907d770456c67fb1d99ed (diff)
downloadotp-9f0460e88a8db944a838991a238568c96e291ae6.tar.gz
otp-9f0460e88a8db944a838991a238568c96e291ae6.tar.bz2
otp-9f0460e88a8db944a838991a238568c96e291ae6.zip
Merge branch 'maint'
Diffstat (limited to 'lib')
-rw-r--r--lib/diameter/src/diameter.appup.src38
-rw-r--r--lib/diameter/vsn.mk2
2 files changed, 8 insertions, 32 deletions
diff --git a/lib/diameter/src/diameter.appup.src b/lib/diameter/src/diameter.appup.src
index 62ace16faa..c6828e6705 100644
--- a/lib/diameter/src/diameter.appup.src
+++ b/lib/diameter/src/diameter.appup.src
@@ -29,38 +29,13 @@
{"1.3", [{restart_application, diameter}]}, %% R15B03
{"1.3.1", [{restart_application, diameter}]},
{"1.4", [{restart_application, diameter}]}, %% R16A
- {"1.4.1", [{load_module, diameter_reg}, %% R16B
- {load_module, diameter_stats},
- {load_module, diameter_traffic},
- {load_module, diameter_service},
+ {"1.4.1", [{restart_application, diameter}]}, %% R16B
+ {"1.4.1.1", [{restart_application, diameter}]},
+ {"1.4.2", [{load_module, diameter_types}, %% R16B01
{load_module, diameter_config},
- {load_module, diameter_peer},
+ {load_module, diameter_service},
{load_module, diameter_peer_fsm},
- {load_module, diameter_watchdog},
- {load_module, diameter_capx},
- {load_module, diameter_codec},
- {load_module, diameter_gen_base_rfc3588},
- {load_module, diameter_gen_base_accounting},
- {load_module, diameter_gen_base_rfc6733},
- {load_module, diameter_gen_base_acct6733},
- {load_module, diameter_tcp},
- {load_module, diameter_lib},
- {load_module, diameter}]},
- {"1.4.1.1", [{load_module, diameter_traffic},
- {load_module, diameter_service},
- {load_module, diameter_config},
- {load_module, diameter_peer},
- {load_module, diameter_peer_fsm},
- {load_module, diameter_watchdog},
- {load_module, diameter_capx},
- {load_module, diameter_codec},
- {load_module, diameter_gen_base_rfc3588},
- {load_module, diameter_gen_base_accounting},
- {load_module, diameter_gen_base_rfc6733},
- {load_module, diameter_gen_base_acct6733},
- {load_module, diameter_tcp},
- {load_module, diameter_lib},
- {load_module, diameter}]}
+ {load_module, diameter_watchdog}]}
],
[
{"0.9", [{restart_application, diameter}]},
@@ -73,6 +48,7 @@
{"1.3.1", [{restart_application, diameter}]},
{"1.4", [{restart_application, diameter}]},
{"1.4.1", [{restart_application, diameter}]},
- {"1.4.1.1", [{restart_application, diameter}]}
+ {"1.4.1.1", [{restart_application, diameter}]},
+ {"1.4.2", [{restart_application, diameter}]}
]
}.
diff --git a/lib/diameter/vsn.mk b/lib/diameter/vsn.mk
index f7462c3916..e003fe76b9 100644
--- a/lib/diameter/vsn.mk
+++ b/lib/diameter/vsn.mk
@@ -18,5 +18,5 @@
# %CopyrightEnd%
APPLICATION = diameter
-DIAMETER_VSN = 1.4.2
+DIAMETER_VSN = 1.4.3
APP_VSN = $(APPLICATION)-$(DIAMETER_VSN)$(PRE_VSN)