aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/sys/unix/sys.c
diff options
context:
space:
mode:
authorAnders Svensson <[email protected]>2015-03-23 12:37:26 +0100
committerAnders Svensson <[email protected]>2015-03-23 12:37:26 +0100
commit7d05e55951b4f3fc4af0febb965d3075e5ddf324 (patch)
tree481788ecb55b80ae8b29bb7cf6608d03fed36791 /erts/emulator/sys/unix/sys.c
parent88c8959a685ee5c296d57e9d50de46dbb19cc1df (diff)
parent09e51b177e0b2c1528c99bdd1c354319e07bc421 (diff)
downloadotp-7d05e55951b4f3fc4af0febb965d3075e5ddf324.tar.gz
otp-7d05e55951b4f3fc4af0febb965d3075e5ddf324.tar.bz2
otp-7d05e55951b4f3fc4af0febb965d3075e5ddf324.zip
Merge branch 'anders/diameter/dpr/OTP-12542' into maint
* anders/diameter/dpr/OTP-12542: Discard CER or DWR sent with diameter:call/4 Allow DPR to be sent with diameter:call/4 Add transport_opt() dpa_timeout Add testcase for sending DPR with diameter:call/4
Diffstat (limited to 'erts/emulator/sys/unix/sys.c')
0 files changed, 0 insertions, 0 deletions