From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 10 Aug 2016 18:55:22 +0000 (-0700)
Subject: Merge branch 'ls/travis-enable-httpd-tests' into maint
X-Git-Tag: v2.9.3~20
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=dbc5276fedbe5ac86951a054e6e8ae610f073d9d;p=git

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

Allow http daemon tests in Travis CI tests.

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

dbc5276fedbe5ac86951a054e6e8ae610f073d9d
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: