kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

merge revision(s) 23485:

Browse source 
* lib/pathname.rb (Pathname#sub): suppress a warning.
	  [ruby-dev:38488]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@28337 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
shyouhei 2010-06-16 07:01:05 +00:00
parent 836271c28b
commit c9915e5b08
3 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Wed Jun 16 16:01:42 2010 Tanaka Akira <akr@fsij.org>
* lib/pathname.rb (Pathname#sub): suppress a warning.
[ruby-dev:38488]
Wed Jun 16 15:21:12 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
* test/webrick/utils.rb (TestWEBrick#start_server): add log for

2
lib/pathname.rb
View file

@ -260,7 +260,7 @@ class Pathname
ensure
Thread.current[:pathname_sub_matchdata] = old
end
yield *args
yield(*args)
}
else
path = @path.sub(pattern, *rest)

2
version.h
View file

@ -2,7 +2,7 @@
#define RUBY_RELEASE_DATE "2010-06-16"
#define RUBY_VERSION_CODE 187
#define RUBY_RELEASE_CODE 20100616
#define RUBY_PATCHLEVEL 295
#define RUBY_PATCHLEVEL 296
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 8