diff options
author | Junio C Hamano <gitster@pobox.com> | 2013-07-19 10:41:01 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2013-07-19 10:41:01 -0700 |
commit | 211e76d48b86f9b3e38c9c9f62d104723dea1964 (patch) | |
tree | 89178d950ea0af4df69f579b682e36ed46181852 /t/t7011-skip-worktree-reading.sh | |
parent | 8589a74b191f1842b633020e28de1c4a1c7f607c (diff) | |
parent | 5bdc47eb55aabef3720039181fc360499081a29f (diff) | |
download | git-211e76d48b86f9b3e38c9c9f62d104723dea1964.tar.gz |
Merge branch 'jk/apache-test-for-2.4' into maint
Allow our tests to run with newer Apache.
* 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
Diffstat (limited to 't/t7011-skip-worktree-reading.sh')
0 files changed, 0 insertions, 0 deletions