From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 25 Jul 2016 21:13:39 +0000 (-0700)
Subject: Merge branch 'ls/travis-enable-httpd-tests'
X-Git-Tag: v2.10.0-rc0~90
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=976809a8e202d40bc32adc4fff0c0b5056f89fca;p=thirdparty%2Fgit.git

Merge branch 'ls/travis-enable-httpd-tests'

Allow http daemon tests in Travis CI tests.

* ls/travis-enable-httpd-tests:
  travis-ci: enable web server tests t55xx on Linux
---

976809a8e202d40bc32adc4fff0c0b5056f89fca
diff --cc .travis.yml
index c2b76f9b7e,3c5408084c..477c3d2efb
--- a/.travis.yml
+++ b/.travis.yml
@@@ -18,7 -18,7 +18,8 @@@ addons
    apt:
      packages:
      - language-pack-is
 +    - git-svn
+     - apache2
  
  env:
    global: