aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/beam/erl_alloc.c
diff options
context:
space:
mode:
authorHenrik Nord <[email protected]>2015-06-02 14:38:52 +0200
committerHenrik Nord <[email protected]>2015-06-02 14:41:45 +0200
commit00872fbaa648c47f49adf221656b186810ccfc9d (patch)
tree7514de0f92d502b943317f6fc94966eea2136908 /erts/emulator/beam/erl_alloc.c
parent2d4367f3c863e71006aed3e0076cf3cd08ca2b42 (diff)
parentc1780b76cdfefbb52025afcf27f6eab01a464e90 (diff)
downloadotp-00872fbaa648c47f49adf221656b186810ccfc9d.tar.gz
otp-00872fbaa648c47f49adf221656b186810ccfc9d.tar.bz2
otp-00872fbaa648c47f49adf221656b186810ccfc9d.zip
Merge branch 'weiss/propagate-setopt-error'
* weiss/propagate-setopt-error: Don't throw exception on prim_inet:setopt/3 error OTP-12798
Diffstat (limited to 'erts/emulator/beam/erl_alloc.c')
0 files changed, 0 insertions, 0 deletions