aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-01-08 02:39:23 +0000
committerhsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-01-08 02:39:23 +0000
commitc4675d865a9d555ab1648e81a891df9e344e4ae0 (patch)
tree3744f5b9b194bfb761af96740e5193833962e53a
parent89ba151440a243e44fc6afa93eed871887cbf195 (diff)
downloadruby-c4675d865a9d555ab1648e81a891df9e344e4ae0.tar.gz
* .travis.yml: Remove redundant configuration option.
[fix GH-809] Patch by @gxworld git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49176 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--.travis.yml2
-rw-r--r--ChangeLog5
2 files changed, 6 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml
index 4550563a02..a9836d79e7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -53,7 +53,7 @@ before_script:
- "make -f common.mk BASERUBY=ruby srcdir=. update-config_files"
- "autoconf"
- "mkdir config_1st config_2nd"
- - "./configure -C --disable-install-doc --disable-install-rdoc --with-gcc=$CC $OPENSSL_FLAG"
+ - "./configure -C --disable-install-doc --with-gcc=$CC $OPENSSL_FLAG"
- "cp -pr config.status .ext/include config_1st"
- "make reconfig"
- "cp -pr config.status .ext/include config_2nd"
diff --git a/ChangeLog b/ChangeLog
index 0954e6acc3..dd7b72abdd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Jan 8 11:39:18 2015 SHIBATA Hiroshi <shibata.hiroshi@gmail.com>
+
+ * .travis.yml: Remove redundant configuration option.
+ [fix GH-809] Patch by @gxworld
+
Thu Jan 8 07:17:14 2015 Eric Wong <e@80x24.org>
* lib/resolv.rb: consider ENETUNREACH as ResolvTimeout