diff options
| author | Zandra <[email protected]> | 2015-11-26 11:58:47 +0100 |
|---|---|---|
| committer | Zandra <[email protected]> | 2015-11-26 11:58:47 +0100 |
| commit | 9baa87406fe7a9b914ec50eb90ff6808db9734a9 (patch) | |
| tree | 2b1c30d945d7ba68be301482b621157a4490b8ab /lib | |
| parent | 7cff7b6f315cce44c4f4eae6b6bf30e255314fd6 (diff) | |
| parent | b99d992454d0ffded5b18907ff905c214fcccc9c (diff) | |
| download | otp-9baa87406fe7a9b914ec50eb90ff6808db9734a9.tar.gz otp-9baa87406fe7a9b914ec50eb90ff6808db9734a9.tar.bz2 otp-9baa87406fe7a9b914ec50eb90ff6808db9734a9.zip | |
Merge branch 'zandra/fix-24h-macro-in-suite' into maint
* zandra/fix-24h-macro-in-suite:
fix 24h macro in test suite
Diffstat (limited to 'lib')
| -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). |