summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-10-03 12:02:46 +0000
committerhsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-10-03 12:02:46 +0000
commitd36f3e3b43c596ff85f6d19f5a4819d5a0916834 (patch)
treec97059b8eee4c004a47470ff1050ac49002a6942
parent66b6179ec16788c7fb451d40071f30933c02752e (diff)
* .travis.yml: enabled test results of linux.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47772 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--.travis.yml2
-rw-r--r--ChangeLog4
2 files changed, 4 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml
index f89cd2dd58b..7a0b93c6508 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -30,8 +30,6 @@ os:
- osx
matrix:
- allow_failures:
- - os: linux
exclude:
- os: osx
compiler: gcc
diff --git a/ChangeLog b/ChangeLog
index 95101cd5b94..3366de63fd0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Fri Oct 3 19:26:01 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com>
+
+ * .travis.yml: enabled test results of linux.
+
Fri Oct 3 18:52:16 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com>
* test/ruby/test_io.rb (TestIO#test_advise): added workaround of fadvise(2)