]> granicus.if.org Git - apache/commit
Merge r1731929, r1736681 from trunk:
authorYann Ylavic <ylavic@apache.org>
Fri, 1 Apr 2016 12:26:05 +0000 (12:26 +0000)
committerYann Ylavic <ylavic@apache.org>
Fri, 1 Apr 2016 12:26:05 +0000 (12:26 +0000)
commit8f7dbedcae290890c03d9c0aa91b16a217859225
treebf41bbb3d14d71c7293773a7b7b99142a5280cfd
parentb1f4a80ce502fea198cfc8eb20b4808dfadd15b4
Merge r1731929, r1736681 from trunk:

Join multi-line MPM startup log messages into
single long lines.

Followup to r1725394 and r1725548.

Fix missing space in log message

Submitted by: rjung, jailletc36
Reviewed by: jailletc36, ylavic, wrowe

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1737361 13f79535-47bb-0310-9956-ffa450edef68
STATUS
server/mpm/event/event.c
server/mpm/mpmt_os2/mpmt_os2.c
server/mpm/netware/mpm_netware.c
server/mpm/prefork/prefork.c
server/mpm/winnt/mpm_winnt.c
server/mpm/worker/worker.c