diff options
author | Anders Svensson <[email protected]> | 2012-08-28 15:05:56 +0200 |
---|---|---|
committer | Anders Svensson <[email protected]> | 2012-08-28 15:05:56 +0200 |
commit | 66ca6d59f38edf61804a150aa7db134d60524e69 (patch) | |
tree | 2d0f4b26dae069853aad32a42fbe17d303c0c4e6 /lib/diameter/src/base/diameter_config.erl | |
parent | 0c14550c6d768014ccb2e0de570877bb1580ffea (diff) | |
parent | 4b6328306abd9fd55c1d83169350c0fbd35a8e3b (diff) | |
download | otp-66ca6d59f38edf61804a150aa7db134d60524e69.tar.gz otp-66ca6d59f38edf61804a150aa7db134d60524e69.tar.bz2 otp-66ca6d59f38edf61804a150aa7db134d60524e69.zip |
Merge branch 'anders/diameter/callback_isolation/OTP-10215' into maint
* anders/diameter/callback_isolation/OTP-10215:
Don't let peer_up/peer_down take down the service process
Turn last field of #diameter_app{} into an options list
Diffstat (limited to 'lib/diameter/src/base/diameter_config.erl')
-rw-r--r-- | lib/diameter/src/base/diameter_config.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/diameter/src/base/diameter_config.erl b/lib/diameter/src/base/diameter_config.erl index eb06045ace..e47f63f814 100644 --- a/lib/diameter/src/base/diameter_config.erl +++ b/lib/diameter/src/base/diameter_config.erl @@ -601,7 +601,7 @@ app_acc({application, Opts}, Acc) -> module = init_mod(Mod), init_state = ModS, mutable = init_mutable(M), - answer_errors = init_answers(A)} + options = [{answer_errors, init_answers(A)}]} | Acc]; app_acc(_, Acc) -> Acc. |