aboutsummaryrefslogtreecommitdiffstats
path: root/erts/etc/Makefile
diff options
context:
space:
mode:
authorSiri Hansen <[email protected]>2013-04-04 15:41:19 +0200
committerSiri Hansen <[email protected]>2013-04-04 15:41:19 +0200
commitb74b21ba20e1e5aab7887891bf6672abb33f71fc (patch)
treeac7fe28a63814d7d04788dbc7f41fd5ba893e251 /erts/etc/Makefile
parentc3b26ff8c9d79ebee20fe33b0d8954e5cc68a29f (diff)
parent08edfec49c90b72818525292b465e0024951cc7d (diff)
downloadotp-b74b21ba20e1e5aab7887891bf6672abb33f71fc.tar.gz
otp-b74b21ba20e1e5aab7887891bf6672abb33f71fc.tar.bz2
otp-b74b21ba20e1e5aab7887891bf6672abb33f71fc.zip
Merge branch 'siri/test_server/hanging-io-request/OTP-10991' into maint
* siri/test_server/hanging-io-request/OTP-10991: [test_server] Don't hang due to invalid io request
Diffstat (limited to 'erts/etc/Makefile')
0 files changed, 0 insertions, 0 deletions