Permalink
Browse files

Merge branch 'master' into trinidad

  • Loading branch information...
2 parents 385bca0 + 09d3918 commit c072e24a6ae4735d5500e1f040b2a2d09b0c2602 @rkh rkh committed Mar 10, 2012
Showing with 2 additions and 2 deletions.
  1. +1 −1 Gemfile
  2. +1 −1 test/integration_helper.rb
View
@@ -50,6 +50,7 @@ if RUBY_ENGINE == 'jruby'
else
gem 'yajl-ruby'
gem 'nokogiri'
+ gem 'thin'
end
if RUBY_ENGINE == "ruby"
@@ -66,7 +67,6 @@ if RUBY_ENGINE != 'jruby' or not ENV['TRAVIS']
gem 'mongrel'
end
gem 'RedCloth' unless RUBY_ENGINE == "macruby"
- gem 'thin'
## bluecloth is broken
#gem 'bluecloth'
@@ -65,7 +65,7 @@ def ping(timeout = 10)
def alive?
3.times { get('/ping') }
true
- rescue Errno::ECONNREFUSED, Errno::ECONNRESET, EOFError => error
+ rescue Errno::ECONNREFUSED, Errno::ECONNRESET, EOFError, SystemCallError => error
false
end

0 comments on commit c072e24

Please sign in to comment.