diff options
| author | Fredrik Gustafsson <[email protected]> | 2013-01-22 14:32:59 +0100 |
|---|---|---|
| committer | Fredrik Gustafsson <[email protected]> | 2013-01-22 14:32:59 +0100 |
| commit | ffedd0feb21de368cfede09b3ba5c1026e1633f7 (patch) | |
| tree | 809bb3ca24585b4a568687f6a025b4001a928a25 | |
| parent | eda5f7771a06a17be033e2fcae3703b4a9ab462d (diff) | |
| parent | 0dc8d8df58fd677f5421df79960a63c294aa90b9 (diff) | |
| download | otp-ffedd0feb21de368cfede09b3ba5c1026e1633f7.tar.gz otp-ffedd0feb21de368cfede09b3ba5c1026e1633f7.tar.bz2 otp-ffedd0feb21de368cfede09b3ba5c1026e1633f7.zip | |
Merge branch 'fredrik/ssh/update_versions/R16'
* fredrik/ssh/update_versions/R16:
Fixed some specs - ssh
Bumped version numbers
| -rw-r--r-- | lib/ssh/src/ssh.appup.src | 2 | ||||
| -rw-r--r-- | lib/ssh/src/ssh_client_key_api.erl | 2 | ||||
| -rw-r--r-- | lib/ssh/vsn.mk | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/lib/ssh/src/ssh.appup.src b/lib/ssh/src/ssh.appup.src index 826a11f1f4..cbd8166bb9 100644 --- a/lib/ssh/src/ssh.appup.src +++ b/lib/ssh/src/ssh.appup.src @@ -19,12 +19,14 @@ {"%VSN%", [ + {<<"2.1.2">>, [{restart_application, ssh}]}, {<<"2.1.1">>, [{restart_application, ssh}]}, {<<"2.1">>, [{restart_application, ssh}]}, {<<"2.0\\.*">>, [{restart_application, ssh}]}, {<<"1\\.*">>, [{restart_application, ssh}]} ], [ + {<<"2.1.2">>, [{restart_application, ssh}]}, {<<"2.1.1">>, [{restart_application, ssh}]}, {<<"2.1">>,[{restart_application, ssh}]}, {<<"2.0\\.*">>, [{restart_application, ssh}]}, diff --git a/lib/ssh/src/ssh_client_key_api.erl b/lib/ssh/src/ssh_client_key_api.erl index eed0b85f47..58054a9fc5 100644 --- a/lib/ssh/src/ssh_client_key_api.erl +++ b/lib/ssh/src/ssh_client_key_api.erl @@ -26,7 +26,7 @@ Algorithm :: 'ssh-rsa'| 'ssh-dss'| atom(), ConnectOptions :: proplists:proplist()) -> boolean(). --callback user_key(Algorithm :: 'ssh-rsa'| 'ssh-dss'| atom(), ConnectOptions :: proplists:proplists()) -> +-callback user_key(Algorithm :: 'ssh-rsa'| 'ssh-dss'| atom(), ConnectOptions :: proplists:proplist()) -> {ok, PrivateKey :: #'RSAPrivateKey'{}| #'DSAPrivateKey'{} | term()} | {error, string()}. diff --git a/lib/ssh/vsn.mk b/lib/ssh/vsn.mk index 921ec2206a..71666a3179 100644 --- a/lib/ssh/vsn.mk +++ b/lib/ssh/vsn.mk @@ -1,5 +1,5 @@ #-*-makefile-*- ; force emacs to enter makefile-mode -SSH_VSN = 2.1.2 +SSH_VSN = 2.1.3 APP_VSN = "ssh-$(SSH_VSN)" |