merges r29544 from trunk into ruby_1_9_2.

--
* lib/net/telnet.rb (Net::Telnet#close): added.
  patched by Erik Hollensbe [ruby-dev:42260] #3830

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30128 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
yugui 2010-12-08 08:08:59 +00:00
parent 7231be4c35
commit ee72d1c46c
3 changed files with 10 additions and 1 deletions

View file

@ -1,3 +1,8 @@
Thu Oct 21 15:42:01 2010 NARUSE, Yui <naruse@ruby-lang.org>
* lib/net/telnet.rb (Net::Telnet#close): added.
patched by Erik Hollensbe [ruby-dev:42260] #3830
Wed Oct 27 18:27:17 2010 NAKAMURA Usaku <usa@ruby-lang.org> Wed Oct 27 18:27:17 2010 NAKAMURA Usaku <usa@ruby-lang.org>
* test/ruby/test_io.rb (TestIO#pipe): should close write end of pipe * test/ruby/test_io.rb (TestIO#pipe): should close write end of pipe

View file

@ -754,6 +754,10 @@ module Net
line line
end end
def close
@sock.close
end
end # class Telnet end # class Telnet
end # module Net end # module Net

View file

@ -1,5 +1,5 @@
#define RUBY_VERSION "1.9.2" #define RUBY_VERSION "1.9.2"
#define RUBY_PATCHLEVEL 82 #define RUBY_PATCHLEVEL 83
#define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_MINOR 9
#define RUBY_VERSION_TEENY 1 #define RUBY_VERSION_TEENY 1