aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/test
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2015-09-20 11:34:07 +0200
committerIngela Anderton Andin <[email protected]>2015-09-20 11:34:07 +0200
commit8a84e8ec16df01fcd37e61f2cf22c4b17178507a (patch)
tree6922b713e4dfa5ae2753893efc033d23093e42fc /erts/emulator/test
parent9d5aa4ee276c142e9800262333103be5da600a53 (diff)
parent4efe89d8e2ef1eca4ebccf7e753839e52b08daa4 (diff)
downloadotp-8a84e8ec16df01fcd37e61f2cf22c4b17178507a.tar.gz
otp-8a84e8ec16df01fcd37e61f2cf22c4b17178507a.tar.bz2
otp-8a84e8ec16df01fcd37e61f2cf22c4b17178507a.zip
Merge branch 'ia/ssl/soft-upgrade' into maint
* ia/ssl/soft-upgrade: ssl: Correct soft upgrade test
Diffstat (limited to 'erts/emulator/test')
0 files changed, 0 insertions, 0 deletions