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

[20306] Ignore 0x8007 if coming from other vendor (backport #4291) #4309

Merged
merged 2 commits into from
Feb 27, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 27, 2024

This is an automatic backport of pull request #4291 done by Mergify.


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

@EduPonz EduPonz added this to the v2.12.2 milestone Jan 27, 2024
@EduPonz
Copy link

EduPonz commented Feb 16, 2024

@Mergifyio rebase 2.12.x

* Refs #20306: Add regression test

Signed-off-by: EduPonz <eduardoponz@eprosima.com>

* Refs #20306: Ignore PID_NETWORK_CONFIGURATION_SET if coming from other vendor

Signed-off-by: EduPonz <eduardoponz@eprosima.com>

* Refs #20306: Apply Miguel's suggestions

Signed-off-by: EduPonz <eduardoponz@eprosima.com>

* Refs #20306: Fix windows warning

Signed-off-by: EduPonz <eduardoponz@eprosima.com>

---------

Signed-off-by: EduPonz <eduardoponz@eprosima.com>
(cherry picked from commit 5a3acb4)
Copy link
Contributor Author

mergify bot commented Feb 16, 2024

rebase 2.12.x

✅ Branch has been successfully rebased

@EduPonz
Copy link

EduPonz commented Feb 16, 2024

@richiprosima please test this

Signed-off-by: EduPonz <eduardoponz@eprosima.com>
@EduPonz
Copy link

EduPonz commented Feb 16, 2024

@richiprosima please test this

@elianalf elianalf added the ci-pending PR which CI is running label Feb 21, 2024
@elianalf
Copy link
Contributor

@richiprosima please test linux

@elianalf
Copy link
Contributor

@richiprosima please test windows

@elianalf
Copy link
Contributor

@richiprosima please test mac

2 similar comments
@EduPonz
Copy link

EduPonz commented Feb 24, 2024

@richiprosima please test mac

@elianalf
Copy link
Contributor

@richiprosima please test mac

@elianalf elianalf added the ready-to-merge Ready to be merged. CI and changes have been reviewed and approved. label Feb 27, 2024
@EduPonz EduPonz merged commit a00eb67 into 2.12.x Feb 27, 2024
16 of 20 checks passed
@EduPonz EduPonz deleted the mergify/bp/2.12.x/pr-4291 branch February 27, 2024 08:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ci-pending PR which CI is running 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.

2 participants