diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-11-18 16:48:48 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-11-18 16:48:48 +0000 |
commit | af4c9b7a4f0c533051f28f85ed4a949a4e8581c3 (patch) | |
tree | 30bcd7252c17b37d3310bb750b39a56a37f3ec25 /ChangeLog | |
parent | 07126b6f1225a299811df851ffb31d397bb63182 (diff) |
merges r20249 from trunk into ruby_1_9_1.
* lib/net/ftp.rb (Net::FTP#open_socket): SOCKSsocket is obsolete.
a patch from Alan Johnson <alan.wayne.johnson at gmail.com> in
[ruby-core:19982].
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@20273 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ChangeLog')
-rw-r--r-- | ChangeLog | 6 |
1 files changed, 6 insertions, 0 deletions
@@ -1,3 +1,9 @@ +Tue Nov 18 20:30:08 2008 Yukihiro Matsumoto <matz@ruby-lang.org> + + * lib/net/ftp.rb (Net::FTP#open_socket): SOCKSsocket is obsolete. + a patch from Alan Johnson <alan.wayne.johnson at gmail.com> in + [ruby-core:19982]. + Tue Nov 18 16:18:23 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> * lib/logger.rb (ProgName): fixed for svn, based on a patch from |