com php-src: Merge branch 'PHP-5.4' into PHP-5.5: sapi/fpm/config.m4
| From: | Remi Collet | Date: | Tue, 21 May 2013 07:53:51 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.4' into PHP-5.5: sapi/fpm/config.m4 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-72215@lists.php.net to get a copy of this message | ||
Commit: c79f162c3724fdf935256f7020523cbb54db0795
Author: Remi Collet <remi@php.net> Tue, 21 May 2013 09:53:51 +0200
Parents: a2d6d274584d5df2aa9c040396066d30ffd44d82 0e99329e0aa8bbfe1b6d0ad06660630538118e2f
Branches: PHP-5.5 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=c79f162c3724fdf935256f7020523cbb54db0795
Log:
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Add --with-fpm-systemd option to report health to systemd, and systemd_interval option to
configure this. The service can now use Type=notify in the systemd unit file.
Changed paths:
MM sapi/fpm/config.m4
Diff: