diff options
| author | Ingela Anderton Andin <[email protected]> | 2010-08-24 08:57:57 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2010-08-24 08:57:57 +0200 |
| commit | 574a68e84c92a8a44ea2e5d18a1cd2025892d496 (patch) | |
| tree | 7ab50c40c457d500cdc2432ca3cc974d8f0959b1 /lib/ssl/src/ssl_session.erl | |
| parent | 7ed6bbd4e8bb88958bd45f85e3ef8af39c9f894f (diff) | |
| parent | 12dfe961aeaf1a826d851361a24519e54d8ef119 (diff) | |
| download | otp-574a68e84c92a8a44ea2e5d18a1cd2025892d496.tar.gz otp-574a68e84c92a8a44ea2e5d18a1cd2025892d496.tar.bz2 otp-574a68e84c92a8a44ea2e5d18a1cd2025892d496.zip | |
Merge branch 'ia/public_key_api/OTP-8722' into dev
* ia/public_key_api/OTP-8722:
Revise the public_key API
Resolved, version is now 0.8.
Conflicts:
lib/public_key/vsn.mk
Diffstat (limited to 'lib/ssl/src/ssl_session.erl')
| -rw-r--r-- | lib/ssl/src/ssl_session.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ssl/src/ssl_session.erl b/lib/ssl/src/ssl_session.erl index e9755cb0e1..6db13e5b7a 100644 --- a/lib/ssl/src/ssl_session.erl +++ b/lib/ssl/src/ssl_session.erl @@ -35,7 +35,7 @@ -type seconds() :: integer(). %%-------------------------------------------------------------------- --spec is_new(binary(), binary()) -> boolean(). +-spec is_new(session_id(), session_id()) -> boolean(). %% %% Description: Checks if the session id decided by the server is a %% new or resumed sesion id. |