aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMicael Karlberg <[email protected]>2014-06-12 13:48:21 +0200
committerMicael Karlberg <[email protected]>2014-06-12 13:48:21 +0200
commit9d656d698bda7a8aba0a52cbf556fb90ffc57c02 (patch)
tree48fa47db91e854f1bf86a004614833683f701ab4
parent5064e3d33eaf16a64dc99c0a86296f697640c09d (diff)
parent034a301b215ead5359ed778bcf6d8ab32186b8f9 (diff)
downloadotp-9d656d698bda7a8aba0a52cbf556fb90ffc57c02.tar.gz
otp-9d656d698bda7a8aba0a52cbf556fb90ffc57c02.tar.bz2
otp-9d656d698bda7a8aba0a52cbf556fb90ffc57c02.zip
Merge branch 'maint'
-rw-r--r--lib/diameter/src/diameter.appup.src4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/diameter/src/diameter.appup.src b/lib/diameter/src/diameter.appup.src
index b7b9662383..3b6e259f5a 100644
--- a/lib/diameter/src/diameter.appup.src
+++ b/lib/diameter/src/diameter.appup.src
@@ -43,7 +43,7 @@
{load_module, diameter_gen_base_rfc6733},
{load_module, diameter_gen_acct_rfc6733},
{load_module, diameter_gen_base_rfc3588},
- {load_module, diameter_gen_accounting},
+ {load_module, diameter_gen_base_accounting},
{load_module, diameter_gen_relay},
{load_module, diameter_codec},
{load_module, diameter_sctp}]}
@@ -67,7 +67,7 @@
{"1.6", [{load_module, diameter_sctp},
{load_module, diameter_codec},
{load_module, diameter_gen_relay},
- {load_module, diameter_gen_accounting},
+ {load_module, diameter_gen_base_accounting},
{load_module, diameter_gen_base_rfc3588},
{load_module, diameter_gen_acct_rfc6733},
{load_module, diameter_gen_base_rfc6733},