]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 39abbd3 5bdc47e)
Merge branch 'jk/apache-test-for-2.4'
authorJunio C Hamano <gitster@pobox.com>
Sun, 23 Jun 2013 21:53:17 +0000 (14:53 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 23 Jun 2013 21:53:17 +0000 (14:53 -0700)
* jk/apache-test-for-2.4:
  lib-httpd/apache.conf: check version only after mod_version loads
  t/lib-httpd/apache.conf: configure an MPM module for apache 2.4
  t/lib-httpd/apache.conf: load compat access module in apache 2.4
  t/lib-httpd/apache.conf: load extra auth modules in apache 2.4
  t/lib-httpd/apache.conf: do not use LockFile in apache >= 2.4

1  2 
t/lib-httpd/apache.conf patch | diff1 | diff2 | blob | history

diff --cc t/lib-httpd/apache.conf
Simple merge
Unnamed repository; edit this file 'description' to name the repository.