From cf33a35a731aca2c3a9d8d7e24e25f3e8e3052f8 Mon Sep 17 00:00:00 2001
From: hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 22 Sep 2014 09:21:39 +0000
Subject: [PATCH] * .travis.yml: Only osx build is enabled. linux builds is
 random failure   and test results of major linux is covered by rubyci.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47684 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 .travis.yml | 2 +-
 ChangeLog   | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 6e8e29560c..bf5235b938 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -31,7 +31,7 @@ os:
 
 matrix:
   allow_failures:
-    - os: osx
+    - os: linux
   exclude:
     - os: osx
       compiler: gcc
diff --git a/ChangeLog b/ChangeLog
index eecafaf85b..9cfbf8cdc6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Sep 22 18:21:35 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* .travis.yml: Only osx build is enabled. linux builds is random failure
+	  and test results of major linux is covered by rubyci.
+
 Mon Sep 22 12:10:29 2014  Tanaka Akira  <akr@fsij.org>
 
 	* test/ruby/test_time_tz.rb: Fix test error with tzdata-2014g.