diff options
| author | Erlang/OTP <[email protected]> | 2015-03-13 16:35:40 +0100 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2015-03-13 16:35:40 +0100 |
| commit | 6e2268e187c84908572e2e6a1fb282a7ba8dc45a (patch) | |
| tree | e7aca7375e491169ff6a3ec79da163c21614d15e /lib/os_mon/include/memsup.hrl | |
| parent | 5a137003f1eb045a39c18438ecc1b22081747487 (diff) | |
| parent | 90e3fdf7a7ed036d51fcd0477141343af9f1cc30 (diff) | |
| download | otp-6e2268e187c84908572e2e6a1fb282a7ba8dc45a.tar.gz otp-6e2268e187c84908572e2e6a1fb282a7ba8dc45a.tar.bz2 otp-6e2268e187c84908572e2e6a1fb282a7ba8dc45a.zip | |
Merge branch 'ia/ssl/maint15/poodle' into maint-r15
* ia/ssl/maint15/poodle:
ssl: Special Poodle protection version for OTP-R15 track
ssl: Check that negotiated version is a supported version.
ssl: Renable padding check
Diffstat (limited to 'lib/os_mon/include/memsup.hrl')
0 files changed, 0 insertions, 0 deletions