Merge branch 'PHP-7.4'

nikic · nikic · commit 4cdd15d4146c · 2020-02-03T09:58:03.000+01:00
* PHP-7.4:
  Disable parallelism for FPM tests
diff --git a/sapi/fpm/tests/CONFLICTS b/sapi/fpm/tests/CONFLICTS
@@ -1 +1,3 @@
-fpm
+# FPM tests have many spurious failures on Azure recently,
+# try to run them without parallelism.
+all

-Original file line number
+Diff line change
@@ @@ -1 +1,3 @@ @@
 -fpm
 +# FPM tests have many spurious failures on Azure recently,
 +# try to run them without parallelism.
 +all