Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[20599] Protect asio exception hotfix (backport #4527) #4530

Merged
merged 1 commit into from
Mar 28, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 8, 2024

This is an automatic backport of pull request #4527 done by Mergify.
Cherry-pick of 08193d5 has failed:

On branch mergify/bp/2.13.x/pr-4527
Your branch is up to date with 'origin/2.13.x'.

You are currently cherry-picking commit 08193d5f7.
  (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:   src/cpp/rtps/transport/TCPTransportInterface.cpp

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.

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 <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

Copy link
Contributor Author

mergify bot commented Mar 8, 2024

Cherry-pick of 08193d5 has failed:

On branch mergify/bp/2.13.x/pr-4527
Your branch is up to date with 'origin/2.13.x'.

You are currently cherry-picking commit 08193d5f7.
  (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:   src/cpp/rtps/transport/TCPTransportInterface.cpp

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 mergify bot added the conflicts Backport PR wich git cherry pick failed label Mar 8, 2024
@mergify mergify bot mentioned this pull request Mar 8, 2024
10 tasks
@JesusPoderoso JesusPoderoso added this to the v2.13.4 milestone Mar 8, 2024
@cferreiragonz cferreiragonz changed the base branch from 2.13.x to mergify/bp/2.13.x/pr-4300 March 8, 2024 12:53
@cferreiragonz cferreiragonz added ci-pending PR which CI is running and removed conflicts Backport PR wich git cherry pick failed labels Mar 8, 2024
@cferreiragonz
Copy link
Contributor

@cferreiragonz cferreiragonz added the temporarily-blocked PR must be merged after another one label Mar 13, 2024
@JesusPoderoso JesusPoderoso removed the ci-pending PR which CI is running label Mar 13, 2024
Base automatically changed from mergify/bp/2.13.x/pr-4300 to 2.13.x March 22, 2024 15:35
@JesusPoderoso JesusPoderoso added ci-pending PR which CI is running and removed temporarily-blocked PR must be merged after another one labels Mar 23, 2024
@JesusPoderoso
Copy link
Contributor

@Mergifyio rebase 2.13.x

* Refs #20599: Handle error code before function call

Signed-off-by: cferreiragonz <[email protected]>

* Apply suggestion

Co-authored-by: Miguel Company <[email protected]>

---------

Signed-off-by: cferreiragonz <[email protected]>
Co-authored-by: Miguel Company <[email protected]>
(cherry picked from commit 08193d5)
Copy link
Contributor Author

mergify bot commented Mar 23, 2024

rebase 2.13.x

✅ Branch has been successfully rebased

@JesusPoderoso
Copy link
Contributor

@richiprosima please test this

@JesusPoderoso
Copy link
Contributor

CI issues unrelated to the PR.
Ready to merge!

@JesusPoderoso JesusPoderoso added ready-to-merge Ready to be merged. CI and changes have been reviewed and approved. and removed ci-pending PR which CI is running labels Mar 25, 2024
@EduPonz EduPonz merged commit 7ccff47 into 2.13.x Mar 28, 2024
12 of 15 checks passed
@EduPonz EduPonz deleted the mergify/bp/2.13.x/pr-4527 branch March 28, 2024 08:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ready-to-merge Ready to be merged. CI and changes have been reviewed and approved.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants