com php-src: Add CONFLCITS file for fpm: sapi/fpm/tests/CONFLICTS
| From: | Nikita Popov | Date: | Fri, 31 May 2019 08:54:41 +0000 |
| Subject: | com php-src: Add CONFLCITS file for fpm: sapi/fpm/tests/CONFLICTS | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-106479@lists.php.net to get a copy of this message | ||
Commit: 96a11bee1c6541af98f54b3779b36b92e6c6b735
Author: Nikita Popov <nikita.ppv@gmail.com> Fri, 31 May 2019 10:54:32 +0200
Parents: 4b1f711823da2ea9f4bebfa56f527d27dbfa13a2
Branches: PHP-7.4 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=96a11bee1c6541af98f54b3779b36b92e6c6b735
Log:
Add CONFLCITS file for fpm
We should not run FPM tests in parallel due to port clashes.
Changed paths:
A sapi/fpm/tests/CONFLICTS
Diff:
diff --git a/sapi/fpm/tests/CONFLICTS b/sapi/fpm/tests/CONFLICTS
new file mode 100644
index 0000000..14c2e0b
--- /dev/null
+++ b/sapi/fpm/tests/CONFLICTS
@@ -0,0 +1 @@
+fpm