Skip to content

Commit 106dc09

Browse files
headiusheadius
committedMay 22, 2018
Merge branch 'master' into super_fixes
2 parents 7799044 + 8c3a669 commit 106dc09

File tree

168 files changed

+1390
-16130
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

168 files changed

+1390
-16130
lines changed
 

‎.gitignore

+5
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,10 @@ lib/ruby/cext/
5353
lib/ruby/gems
5454
lib/ruby/stdlib/*.jar
5555
lib/ruby/stdlib/ant*
56+
lib/ruby/stdlib/cmath.rb
57+
lib/ruby/stdlib/csv.rb
5658
lib/ruby/stdlib/did_you_mean*
59+
lib/ruby/stdlib/fileutils.rb
5760
lib/ruby/stdlib/gauntlet_rdoc.rb
5861
lib/ruby/stdlib/ipaddr*
5962
lib/ruby/stdlib/jar*
@@ -75,6 +78,8 @@ lib/ruby/stdlib/readline*
7578
lib/ruby/stdlib/minitest*
7679
lib/ruby/stdlib/power_assert*
7780
lib/ruby/stdlib/psych*
81+
lib/ruby/stdlib/scanf.rb
82+
lib/ruby/stdlib/webrick*
7883
lib/ruby/stdlib/**/maven-metadata-local.xml
7984
release.properties
8085
share

‎.travis.yml

-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ env:
4343
- PHASE='-Prake -Dtask=test:mri:fullint'
4444
- PHASE='-Prake -Dtask=test:mri:jit'
4545
- PHASE='-Prake -Dtask=test:slow_suites'
46-
- PHASE='-Prake -Dtask=test:tracing'
4746
- PHASE='-Prake -Dtask=spec:ji'
4847
- PHASE='-Prake -Dtask=spec:compiler'
4948
- PHASE='-Prake -Dtask=spec:compiler' JRUBY_OPTS=-Xcompile.invokedynamic

0 commit comments

Comments
 (0)