diff options
author | Anders Svensson <[email protected]> | 2013-12-02 09:45:00 +0100 |
---|---|---|
committer | Anders Svensson <[email protected]> | 2013-12-02 09:45:00 +0100 |
commit | 22ae0b2bd6fbe973915b19551c7d6a397a8c8a60 (patch) | |
tree | 58ced6a6e5e434741a2bfcae26d246206e3f4d7b /lib/diameter/src | |
parent | 0f2458596200b5567b06c626254e2c3477ccfabf (diff) | |
parent | 5994bd25093d42be188564eda2e22c05aa9ad486 (diff) | |
download | otp-22ae0b2bd6fbe973915b19551c7d6a397a8c8a60.tar.gz otp-22ae0b2bd6fbe973915b19551c7d6a397a8c8a60.tar.bz2 otp-22ae0b2bd6fbe973915b19551c7d6a397a8c8a60.zip |
Merge branch 'anders/diameter/R16B03_release/OTP-11499' into maint
* anders/diameter/R16B03_release/OTP-11499:
vsn -> 1.5
Update appup for OTP-11168
Update appup for OTP-11361
Add makefile to build example dictionaries
Add recent Diameter-related RFCs
Generate diameterc.1, not diameter_compile.1
Fix documentation typos
Fix appup blunder
Diffstat (limited to 'lib/diameter/src')
-rw-r--r-- | lib/diameter/src/diameter.appup.src | 31 |
1 files changed, 26 insertions, 5 deletions
diff --git a/lib/diameter/src/diameter.appup.src b/lib/diameter/src/diameter.appup.src index 76fb54e03a..c7ae8a2828 100644 --- a/lib/diameter/src/diameter.appup.src +++ b/lib/diameter/src/diameter.appup.src @@ -31,14 +31,26 @@ {"1.4", [{restart_application, diameter}]}, %% R16A {"1.4.1", [{restart_application, diameter}]}, %% R16B {"1.4.1.1", [{restart_application, diameter}]}, - {"1.4.2", [{load_module, diameter_types}, %% R16B01 + {"1.4.2", [{load_module, diameter_codec}, %% R16B01 + {load_module, diameter_types}, {load_module, diameter_config}, + {load_module, diameter_capx}, {load_module, diameter_service}, {load_module, diameter_peer_fsm}, - {load_module, diameter_watchdog}]}, - {"1.4.3", [{load_module, diameter_watchdog}, %% R16B02 + {load_module, diameter_watchdog}, + {load_module, diameter}]}, + {"1.4.3", [{load_module, diameter_capx}, %% R16B02 + {load_module, diameter_service}, + {load_module, diameter_watchdog}, {load_module, diameter_codec}, - {load_module, diameter_types}]} + {load_module, diameter_types}, + {load_module, diameter_config}, + {load_module, diameter}]}, + {"1.4.4", [{load_module, diameter_capx}, + {load_module, diameter_service}, + {load_module, diameter_watchdog}, + {load_module, diameter_config}, + {load_module, diameter}]} ], [ {"0.9", [{restart_application, diameter}]}, @@ -54,7 +66,16 @@ {"1.4.1.1", [{restart_application, diameter}]}, {"1.4.2", [{restart_application, diameter}]}, {"1.4.3", [{load_module, diameter_types}, + {load_module, diameter_config}, {load_module, diameter_codec}, - {load_module, diameter_watchdog}]} + {load_module, diameter_service}, + {load_module, diameter_watchdog}, + {load_module, diameter_capx}, + {load_module, diameter}]}, + {"1.4.4", [{load_module, diameter_capx}, + {load_module, diameter_config}, + {load_module, diameter_service}, + {load_module, diameter_watchdog}, + {load_module, diameter}]} ] }. |