]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a2d6d27 0e99329)
Merge branch 'PHP-5.4' into PHP-5.5
authorRemi Collet <remi@php.net>
Tue, 21 May 2013 07:53:51 +0000 (09:53 +0200)
committerRemi Collet <remi@php.net>
Tue, 21 May 2013 07:53:51 +0000 (09:53 +0200)
* 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.

1  2 
sapi/fpm/config.m4 patch | diff1 | diff2 | blob | history

diff --cc sapi/fpm/config.m4
Simple merge
Unnamed repository; edit this file 'description' to name the repository.