diff options
author | Ingela Anderton Andin <[email protected]> | 2015-12-07 10:35:19 +0100 |
---|---|---|
committer | Ingela Anderton Andin <[email protected]> | 2015-12-07 10:35:19 +0100 |
commit | f258633921e7dd0bd5760281d2a26a0f937e53c4 (patch) | |
tree | 8c6e16902035cbf583c1325c84bfb8f2b118f8cc /erts/emulator/Makefile | |
parent | 1d1677c2a85ebce0ada828d254c7a1122b825e0a (diff) | |
parent | 55569124ac815eedc21c234c447e346b97f3c8fe (diff) | |
download | otp-f258633921e7dd0bd5760281d2a26a0f937e53c4.tar.gz otp-f258633921e7dd0bd5760281d2a26a0f937e53c4.tar.bz2 otp-f258633921e7dd0bd5760281d2a26a0f937e53c4.zip |
Merge branch 'ia/ssl/max-sessions/OTP-12392' into maint
* ia/ssl/max-sessions/OTP-12392:
ssl: Fix documentation mistakes
ssl: Add upper limit for session cache
ssl: Measure elapsed time with erlang:monotonic_time
Diffstat (limited to 'erts/emulator/Makefile')
0 files changed, 0 insertions, 0 deletions