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/test | |
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/test')
-rw-r--r-- | lib/diameter/test/diameter_examples_SUITE.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/diameter/test/diameter_examples_SUITE.erl b/lib/diameter/test/diameter_examples_SUITE.erl index 75b542b679..02c8d34361 100644 --- a/lib/diameter/test/diameter_examples_SUITE.erl +++ b/lib/diameter/test/diameter_examples_SUITE.erl @@ -133,7 +133,7 @@ make(Path, Dict0) -> try ok = to_erl(Path, [{name, Name}, {prefix, Pre}, - {inherits, "rfc3588_base/" ++ Mod0} + {inherits, "common/" ++ Mod0} | [{inherits, D ++ "/" ++ M ++ Suf} || {D,M} <- dep(Dict)]]), ok = to_beam(Name) |