summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorjeg2 <jeg2@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-10-25 22:18:58 +0000
committerjeg2 <jeg2@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-10-25 22:18:58 +0000
commit8f009c18e81e75e0632da6042c33cba7a40bd252 (patch)
treeb88160010d55768678e8c6ab930667d12894061e /ChangeLog
parent40e6b491eafaf7882d4c6f491e51f2456e4ce5a6 (diff)
Merged 13781 from trunk.
* lib/net/telnet.rb (Net::Telnet#login): Allowing "passphrase" in addition to "password" for Telnet login prompts. [ruby-Bugs-10746] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@13782 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog7
1 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 62b352b87e..cf81870b2e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Wed Oct 25 07:18:09 2007 James Edward Gray II <jeg2@ruby-lang.org>
+
+ Merged 13781 from trunk.
+
+ * lib/net/telnet.rb (Net::Telnet#login): Allowing "passphrase" in
+ addition to "password" for Telnet login prompts. [ruby-Bugs-10746]
+
Wed Oct 25 06:46:21 2007 James Edward Gray II <jeg2@ruby-lang.org>
Merged 13779 from trunk.