aboutsummaryrefslogtreecommitdiffstats
path: root/lib/diameter/src/diameter.appup.src
diff options
context:
space:
mode:
authorAnders Svensson <[email protected]>2016-09-12 22:31:33 +0200
committerAnders Svensson <[email protected]>2016-09-12 22:31:33 +0200
commit58cc6bb63216d66975b8b9a895c0596925a8571d (patch)
tree469e10081c0cc0c85a63ad67d4ce1cf8c50be900 /lib/diameter/src/diameter.appup.src
parent5620f7b8e8444bbaf5ad7ba17b842aae2a8f5d9d (diff)
parent3863fc2feecff6f9945082d0b08ff8e423a8da4c (diff)
downloadotp-58cc6bb63216d66975b8b9a895c0596925a8571d.tar.gz
otp-58cc6bb63216d66975b8b9a895c0596925a8571d.tar.bz2
otp-58cc6bb63216d66975b8b9a895c0596925a8571d.zip
Merge branch 'anders/diameter/19.1/OTP-13838' into maint
* anders/diameter/19.1/OTP-13838: vsn -> 1.12.1 Update appup for 19.1 Fix xmllint errors in documentation Remove documentation overkill Don't run traffic tests in parallel when {string_decode, true} Remove copyright from generated dictionary modules Fix dictionary function typo Fix dictionary typo in relay example
Diffstat (limited to 'lib/diameter/src/diameter.appup.src')
-rw-r--r--lib/diameter/src/diameter.appup.src12
1 files changed, 10 insertions, 2 deletions
diff --git a/lib/diameter/src/diameter.appup.src b/lib/diameter/src/diameter.appup.src
index 618d5a7f10..b1b8e38d39 100644
--- a/lib/diameter/src/diameter.appup.src
+++ b/lib/diameter/src/diameter.appup.src
@@ -49,7 +49,11 @@
{"1.10", [{restart_application, diameter}]}, %% 18.0
{"1.11", [{restart_application, diameter}]}, %% 18.1
{"1.11.1", [{restart_application, diameter}]}, %% 18.2
- {"1.11.2", [{restart_application, diameter}]} %% 18.3
+ {"1.11.2", [{restart_application, diameter}]}, %% 18.3
+ {"1.12", [{load_module, diameter_lib}, %% 19.0
+ {load_module, diameter_traffic},
+ {load_module, diameter_tcp},
+ {load_module, diameter_sctp}]}
],
[
{"0.9", [{restart_application, diameter}]},
@@ -80,6 +84,10 @@
{"1.10", [{restart_application, diameter}]},
{"1.11", [{restart_application, diameter}]},
{"1.11.1", [{restart_application, diameter}]},
- {"1.11.2", [{restart_application, diameter}]}
+ {"1.11.2", [{restart_application, diameter}]},
+ {"1.12", [{load_module, diameter_sctp},
+ {load_module, diameter_tcp},
+ {load_module, diameter_traffic},
+ {load_module, diameter_lib}]}
]
}.