granicus.if.org Git - php/commit

]> granicus.if.org Git - php/commit

projects / php / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 70ef2f3 ba6834f)

author	Nikita Popov <nikita.ppv@gmail.com>
	Wed, 18 Mar 2020 10:46:37 +0000 (11:46 +0100)
committer	Nikita Popov <nikita.ppv@gmail.com>
	Wed, 18 Mar 2020 10:46:37 +0000 (11:46 +0100)
commit	e957a8cd9263a2bad1317ac7f88b9cda04081bdc
tree	178e6cdc7e436a4a409092d7dfa0cee29da680f7	tree \| snapshot
parent	70ef2f38173160652c4dcc2b53810604efce963d	commit \| diff
parent	ba6834fa574495d0f31be10b74bd7cfd4ef054e5	commit \| diff

Merge branch 'PHP-7.4'

* PHP-7.4:
  Make bug52820.phpt more robust
  Explicitly start mysql
  Use "set -e" in some pipeline steps

azure/i386/job.yml	diff1 \|	diff2 \|	blob \| history
azure/job.yml	diff1 \|	diff2 \|	blob \| history
azure/msan_job.yml	diff1 \|	diff2 \|	blob \| history
ext/standard/tests/file/bug52820.phpt	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.