diff options
| author | Ingela Anderton Andin <[email protected]> | 2011-03-08 09:45:42 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2011-03-08 09:45:54 +0100 |
| commit | 442fcfd70f0ddc9bd6ca029f5da1de6a0dee5b05 (patch) | |
| tree | e00e0a87beb7823041c1d59ee55e9e63c143fb6a /lib/ssl/test/Makefile | |
| parent | 4c7786f58f8f101723b00e839baa068f8cf34579 (diff) | |
| parent | c034b8ce819cfe1171720499387815ae8dc84bc9 (diff) | |
| download | otp-442fcfd70f0ddc9bd6ca029f5da1de6a0dee5b05.tar.gz otp-442fcfd70f0ddc9bd6ca029f5da1de6a0dee5b05.tar.bz2 otp-442fcfd70f0ddc9bd6ca029f5da1de6a0dee5b05.zip | |
Merge branch 'jk/ssl_connection_hibernate' into dev
* jk/ssl_connection_hibernate:
Add the option { hibernate_after, int() } to ssl:connect and ssl:listen
OTP-9106
Diffstat (limited to 'lib/ssl/test/Makefile')
| -rw-r--r-- | lib/ssl/test/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/ssl/test/Makefile b/lib/ssl/test/Makefile index 823401c863..fd3b6d06ad 100644 --- a/lib/ssl/test/Makefile +++ b/lib/ssl/test/Makefile @@ -1,7 +1,7 @@ # # %CopyrightBegin% # -# Copyright Ericsson AB 1999-2010. All Rights Reserved. +# Copyright Ericsson AB 1999-2011. All Rights Reserved. # # The contents of this file are subject to the Erlang Public License, # Version 1.1, (the "License"); you may not use this file except in @@ -60,6 +60,7 @@ ERL_FILES = $(MODULES:%=%.erl) HRL_FILES = ssl_test_MACHINE.hrl HRL_FILES_SRC = \ + ssl_int.hrl \ ssl_alert.hrl \ ssl_handshake.hrl |