Skip to content

Update to upstream 2.1.5 #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dbussink merged 10 commits into from
Nov 14, 2014
Merged

Update to upstream 2.1.5 #22

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
205003b
* version.h (RUBY_VERSION): bump RUBY_VERSION to 2.1.5.
nagachika Oct 28, 2014
35168b8
merge revision(s) r48174: [Backport #10438]
nagachika Oct 28, 2014
ac3ac78
merge revision(s) r48222: [Backport #10464] [Backport #10465]
nagachika Nov 4, 2014
1d665c3
merge revision(s) r46397: [Backport #10434]
nagachika Nov 4, 2014
901dcec
merge revision(s) r48184: [Backport #10272] [Backport #10438]
nagachika Nov 4, 2014
e5db49c
merge revision(s) 48288: [Backport #9681]
nagachika Nov 6, 2014
d4239a9
merge revision(s) r47860: [Backport #10350]
nagachika Nov 6, 2014
eac759b
merge revision(s) r48402:
nagachika Nov 13, 2014
0d74082
add tag v2_1_5
nagachika Nov 13, 2014
9d08974
Merge tag 'v2_1_5' into dbussink-ruby-2-1-5
dbussink Nov 14, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
merge revision(s) r46397: [Backport ruby#10434] 
	envutil.rb: avoid error on OS X 10.10

	* test/ruby/envutil.rb (diagnostic_reports): Mac OS X 10.10 may
  not create plist file with crash file together.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@48273 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
  • Loading branch information
@nagachika
nagachika committed Nov 4, 2014
commit 1d665c3e0f81fa822366f9ebba52f7b95e811be5
2 changes: 1 addition & 1 deletion test/ruby/envutil.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ def self.diagnostic_reports(signame, cmd, pid, now)
log = File.read(name) rescue next
if /\AProcess:\s+#{cmd} \[#{pid}\]$/ =~ log
File.unlink(name)
File.unlink("#{path}/.#{File.basename(name)}.plist")
File.unlink("#{path}/.#{File.basename(name)}.plist") rescue nil
return log
end
end
Expand Down
2 changes: 1 addition & 1 deletion version.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#define RUBY_VERSION "2.1.5"
#define RUBY_RELEASE_DATE "2014-11-05"
#define RUBY_PATCHLEVEL 268
#define RUBY_PATCHLEVEL 269

#define RUBY_RELEASE_YEAR 2014
#define RUBY_RELEASE_MONTH 11
Expand Down