diff options
| author | Zandra <[email protected]> | 2015-11-26 11:58:54 +0100 |
|---|---|---|
| committer | Zandra <[email protected]> | 2015-11-26 11:58:54 +0100 |
| commit | d056f1953a406f0e86c2c26489d33264f3a63570 (patch) | |
| tree | 2a9aadf43af95f6e99e55b0e74926cae85bc5d42 /lib/ssl | |
| parent | c8f38dbd4922ffb98ad5ab31dc9b247af69b5a96 (diff) | |
| parent | 9baa87406fe7a9b914ec50eb90ff6808db9734a9 (diff) | |
| download | otp-d056f1953a406f0e86c2c26489d33264f3a63570.tar.gz otp-d056f1953a406f0e86c2c26489d33264f3a63570.tar.bz2 otp-d056f1953a406f0e86c2c26489d33264f3a63570.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib/ssl')
| -rw-r--r-- | lib/ssl/test/ssl_basic_SUITE.erl | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/lib/ssl/test/ssl_basic_SUITE.erl b/lib/ssl/test/ssl_basic_SUITE.erl index 6f6107de2c..f032c769e2 100644 --- a/lib/ssl/test/ssl_basic_SUITE.erl +++ b/lib/ssl/test/ssl_basic_SUITE.erl @@ -35,7 +35,6 @@ -include("tls_record.hrl"). -include("tls_handshake.hrl"). --define('24H_in_sec', 86400). -define(TIMEOUT, 20000). -define(EXPIRE, 10). -define(SLEEP, 500). |