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

Ensure correct boost singleton destruction order [13288] (backport #2356) #2358

Merged
merged 2 commits into from
Jan 21, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 17, 2021

This is an automatic backport of pull request #2356 done by Mergify.
Cherry-pick of 80a44fe has failed:

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

You are currently cherry-picking commit 80a44fe34.
  (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:   src/cpp/fastdds/domain/DomainParticipantFactory.cpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   test/unittest/dds/status/CMakeLists.txt

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/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

* Refs 13287. Ensure correct boost singleton destruction order.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

* Refs 13288. Uncrustify.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

* Refs 13288. Fixed typo.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

* Refs 13288. Fixed link error on ListenerTests.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>
(cherry picked from commit 80a44fe)

# Conflicts:
#	test/unittest/dds/status/CMakeLists.txt
@mergify mergify bot added the conflicts Backport PR wich git cherry pick failed label Dec 17, 2021
Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>
@MiguelCompany MiguelCompany removed the conflicts Backport PR wich git cherry pick failed label Jan 21, 2022
@MiguelCompany MiguelCompany added this to the v2.3.5 milestone Jan 21, 2022
@MiguelCompany MiguelCompany merged commit dc95ea1 into 2.3.x Jan 21, 2022
@MiguelCompany MiguelCompany deleted the mergify/bp/2.3.x/pr-2356 branch January 21, 2022 11:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant