]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5'
authorRemi Collet <remi@php.net>
Tue, 21 May 2013 07:54:54 +0000 (09:54 +0200)
committerRemi Collet <remi@php.net>
Tue, 21 May 2013 07:54:54 +0000 (09:54 +0200)
* PHP-5.5:
  NEWS
  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.


Trivial merge