diff options
| author | Patrik Nyblom <[email protected]> | 2012-05-04 11:54:56 +0200 |
|---|---|---|
| committer | Patrik Nyblom <[email protected]> | 2012-05-04 11:54:56 +0200 |
| commit | bb1734e95a5f6a7315819c24bc1fdd799534c787 (patch) | |
| tree | 2bbab9b3a467587482795c471e1c78c08b8bad30 /erts/vsn.mk | |
| parent | c5d6ce6a07478c5ac19fdf2df244c4b837888d08 (diff) | |
| parent | ee6fbc1f57bb7ad7ae19f1978628fc5640bbeb7a (diff) | |
| download | otp-bb1734e95a5f6a7315819c24bc1fdd799534c787.tar.gz otp-bb1734e95a5f6a7315819c24bc1fdd799534c787.tar.bz2 otp-bb1734e95a5f6a7315819c24bc1fdd799534c787.zip | |
Merge branch 'pan/active_once/OTP-10055' into maint
* pan/active_once/OTP-10055:
Remove race in gen_tcp_misc_SUITE:otp_9389
gen_tcp: Make setopts(S,[{active,once}]) try a read
Diffstat (limited to 'erts/vsn.mk')
0 files changed, 0 insertions, 0 deletions