| commit | 23983a473dc889cfba8a64f040942298a6f5f99a | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Sun, 23 Jun 2013 21:53:17 +0000 (23 14:53 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 23 Jun 2013 21:53:17 +0000 (23 14:53 -0700) | ||
| tree | d06d62089c267afe5e3b8139497556d03f2ea382 | treesnapshot (tar.gz zip) |
| parent | 39abbd38d82104e3873af478e7ba509fca3e08af | commitdiff |
| parent | 5bdc47eb55aabef3720039181fc360499081a29f | commitdiff |
Merge branch 'jk/apache-test-for-2.4'
* 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
* 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
| t/lib-httpd/apache.conf | diff1 | diff2 | blobhistory |