]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 50cfe0a 3a16f51)
Merge branch 'PHP-5.6' into PHP-7.0
authorFerenc Kovacs <tyrael@php.net>
Mon, 18 Apr 2016 07:04:55 +0000 (09:04 +0200)
committerFerenc Kovacs <tyrael@php.net>
Mon, 18 Apr 2016 07:04:55 +0000 (09:04 +0200)
* PHP-5.6:
  mark frequent intermittent fpm test with XFAIL

1  2 
sapi/fpm/tests/010.phpt patch | diff1 | diff2 | blob | history

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