aboutsummaryrefslogtreecommitdiffstats
path: root/bootstrap
diff options
context:
space:
mode:
authorRickard Green <[email protected]>2013-05-16 17:41:19 +0200
committerRickard Green <[email protected]>2013-05-16 17:41:19 +0200
commit54e5d891203fee38eaa1dcf76d264fb7bac8ef0d (patch)
treea41c37be0c932b8594023c270da1fe525afece5e /bootstrap
parent80129f47df9b227c45b1298e64f3e62096d81bf2 (diff)
parent127f970059371d968238c8e461bc5c547b021899 (diff)
downloadotp-54e5d891203fee38eaa1dcf76d264fb7bac8ef0d.tar.gz
otp-54e5d891203fee38eaa1dcf76d264fb7bac8ef0d.tar.bz2
otp-54e5d891203fee38eaa1dcf76d264fb7bac8ef0d.zip
Merge branch 'rickard/inet_opts/OTP-11075' into maint
* rickard/inet_opts/OTP-11075: Make high_msgq_watermark and low_msgq_watermark generic inet options Conflicts: erts/preloaded/ebin/prim_inet.beam
Diffstat (limited to 'bootstrap')
0 files changed, 0 insertions, 0 deletions