diff options
author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-02-22 06:01:44 +0000 |
---|---|---|
committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-02-22 06:01:44 +0000 |
commit | d3452b572705e11b0be6e715b00597f14ebe4bdb (patch) | |
tree | fde41a0a2cdb5545afdac3ae6d28049121adceea /ChangeLog | |
parent | 48ccb14404de2f79547be93b3192d1a31971a303 (diff) |
merge revision(s) 44642: [Backport #9093]
* lib/resolv.rb (Resolv::DNS::Resource::TXT#data): Return concatenated
string.
Patch by Ryan Brunner. [ruby-core:58220] [Bug #9093]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@45114 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 @@ +Sat Feb 22 15:01:21 2014 Tanaka Akira <akr@fsij.org> + + * lib/resolv.rb (Resolv::DNS::Resource::TXT#data): Return concatenated + string. + Patch by Ryan Brunner. [ruby-core:58220] [Bug #9093] + Sat Feb 22 14:52:55 2014 Zachary Scott <e@zzak.io> * ext/openssl/ossl_pkey_dh.c: Fixed typo by Sandor Szuecs [Bug #9243] |