Closed mergify[bot] closed 5 months ago
Cherry-pick of e281c60a3556bc61eb760548fc80aba4ee9d9e54 has failed:
On branch mergify/bp/release_2.2/pr-1865
Your branch is up to date with 'origin/release_2.2'.
You are currently cherry-picking commit e281c60a.
(fix conflicts and run "git cherry-pick --continue")
(use "git cherry-pick --skip" to skip this patch)
(use "git cherry-pick --abort" to cancel the cherry-pick operation)
Changes to be committed:
modified: .metwork-framework/components.md
modified: layers/layer1_openresty/0100_openresty/Makefile.mk
new file: layers/layer1_openresty/0100_openresty/ngx_http_lua-fix_CVE-2020-11724.patch
modified: layers/layer1_openresty/0100_openresty/sources
Unmerged paths:
(use "git add <file>..." to mark resolution)
both modified: layers/layer1_openresty/0100_openresty/patches
To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally
Issues
0 New issues
0 Accepted issues
Measures
0 Security Hotspots
No data about Coverage
No data about Duplication
This is an automatic backport of pull request #1865 done by Mergify.