Andrew's git / gitweb.git / diff
?
Merge branch 'ls/travis-enable-httpd-tests'
authorJunio C Hamano <gitster@pobox.com>
Mon, 25 Jul 2016 21:13:39 +0000 (14:13 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 25 Jul 2016 21:13:40 +0000 (14:13 -0700)
Allow http daemon tests in Travis CI tests.

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

1  2 
.travis.yml patch | diff1 | diff2 | blob | history
diff --cc .travis.yml
index c2b76f9b7ea0bfa76720d3c1867ad148c35fa858,3c5408084c80b989059bff9f2918d6f164328d24..477c3d2efb7b94bb34fcda517b1b855e98e1f43a
--- 1/.travis.yml
--- 2/.travis.yml
+++ b/.travis.yml
@@@ -18,7 -18,7 +18,8 @@@ addons
    apt:
      packages:
      - language-pack-is
 +    - git-svn
+     - apache2
  
  env:
    global: