aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNiclas Eklund <nick@erlang.org>2010-03-30 11:28:13 +0000
committerErlang/OTP <otp@erlang.org>2010-03-30 11:28:13 +0000
commit6bfd4d74d1b1b240b5e87311528e67d3e9f080ca (patch)
tree4b51d7b87019de71a885cdb575496034b0014d15
parent695b693a70a36160ab81f45bcbdbedf90ca94860 (diff)
downloadotp-6bfd4d74d1b1b240b5e87311528e67d3e9f080ca.tar.gz
otp-6bfd4d74d1b1b240b5e87311528e67d3e9f080ca.tar.bz2
otp-6bfd4d74d1b1b240b5e87311528e67d3e9f080ca.zip
Exporting ssh:connect/4
-rw-r--r--lib/ssh/doc/src/notes.xml9
-rw-r--r--lib/ssh/src/ssh.erl2
-rw-r--r--lib/ssh/vsn.mk3
3 files changed, 12 insertions, 2 deletions
diff --git a/lib/ssh/doc/src/notes.xml b/lib/ssh/doc/src/notes.xml
index 2533ab8085..0ce83fa5d1 100644
--- a/lib/ssh/doc/src/notes.xml
+++ b/lib/ssh/doc/src/notes.xml
@@ -31,6 +31,15 @@
<section><title>Ssh 1.1.9</title>
+ <section><title>Fixed Bugs and Malfunctions</title>
+ <list>
+ <item>
+ <p>The function ssh:connect/4 was not exported.</p>
+ <p>Own Id: OTP-8550 Aux Id:</p>
+ </item>
+ </list>
+ </section>
+
<section><title>Improvements and New Features</title>
<list>
<item>
diff --git a/lib/ssh/src/ssh.erl b/lib/ssh/src/ssh.erl
index 0eef3f95c0..994c77436a 100644
--- a/lib/ssh/src/ssh.erl
+++ b/lib/ssh/src/ssh.erl
@@ -24,7 +24,7 @@
-include("ssh.hrl").
-include("ssh_connect.hrl").
--export([start/0, start/1, stop/0, connect/3, close/1, connection_info/2,
+-export([start/0, start/1, stop/0, connect/3, connect/4, close/1, connection_info/2,
channel_info/3,
daemon/1, daemon/2, daemon/3,
stop_listener/1, stop_listener/2, stop_daemon/1, stop_daemon/2,
diff --git a/lib/ssh/vsn.mk b/lib/ssh/vsn.mk
index c275cb7acf..074826cafd 100644
--- a/lib/ssh/vsn.mk
+++ b/lib/ssh/vsn.mk
@@ -5,7 +5,8 @@ APP_VSN = "ssh-$(SSH_VSN)"
TICKETS = OTP-8524 \
OTP-8534 \
- OTP-8535
+ OTP-8535 \
+ OTP-8550
TICKETS_1.1.8 = OTP-8356 \
OTP-8401