search

metwork-framework / mfext

metwork/mfext module
http://metwork-framework.org/mfext
BSD 3-Clause "New" or "Revised" License
4 stars 5 forks source link

fix: update circus (to fix preexec_fn issue) (backport #1816) #1818

Closed mergify[bot] closed 5 months ago

mergify[bot] commented 6 months ago

This is an automatic backport of pull request #1816 done by Mergify. Cherry-pick of 38dd0c2fd14b327b39200b68f821b5501b9bba2b has failed:

On branch mergify/bp/release_2.1/pr-1816
Your branch is up to date with 'origin/release_2.1'.

You are currently cherry-picking commit 38dd0c2f.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
    both modified:   .metwork-framework/components.md
    both modified:   layers/layer2_python3_circus/0500_circus/requirements-to-freeze.txt
    both modified:   layers/layer2_python3_circus/0500_circus/requirements3.txt

no changes added to commit (use "git add" and/or "git commit -a")

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

Mergify commands and options
More conditions and actions can be found in the [documentation](https://docs.mergify.com/). You can also trigger Mergify actions by commenting on this pull request: - `@Mergifyio refresh` will re-evaluate the rules - `@Mergifyio rebase` will rebase this PR on its base branch - `@Mergifyio update` will merge the base branch into this PR - `@Mergifyio backport ` will backport this PR on `` branch Additionally, on Mergify [dashboard](https://dashboard.mergify.com) you can: - look at your merge queues - generate the Mergify configuration with the config editor. Finally, you can contact us on https://mergify.com
mergify[bot] commented 6 months ago

Cherry-pick of 38dd0c2fd14b327b39200b68f821b5501b9bba2b has failed:

On branch mergify/bp/release_2.1/pr-1816
Your branch is up to date with 'origin/release_2.1'.

You are currently cherry-picking commit 38dd0c2f.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
    both modified:   .metwork-framework/components.md
    both modified:   layers/layer2_python3_circus/0500_circus/requirements-to-freeze.txt
    both modified:   layers/layer2_python3_circus/0500_circus/requirements3.txt

no changes added to commit (use "git add" and/or "git commit -a")

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

sonarcloud[bot] commented 6 months ago

Quality Gate Passed Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
No data about Coverage
No data about Duplication

See analysis details on SonarCloud