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

[14349] Fix inconsistent ReaderProxy state on intra-process (backport #2626) #2630

Merged
merged 3 commits into from
Apr 12, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Apr 11, 2022

This is an automatic backport of pull request #2626 done by Mergify.
Cherry-pick of 23364f0 has failed:

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

You are currently cherry-picking commit 23364f0b9.
  (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/writer/ReaderProxy.cpp
	both modified:   test/blackbox/common/BlackboxTestsPubSubBasic.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/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 #14346. Added regression test.

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

* Refs #14346. Fix bug.

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

# Conflicts:
#	src/cpp/rtps/writer/ReaderProxy.cpp
#	test/blackbox/common/BlackboxTestsPubSubBasic.cpp
@mergify mergify bot added the conflicts Backport PR wich git cherry pick failed label Apr 11, 2022
Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>
@MiguelCompany MiguelCompany removed the conflicts Backport PR wich git cherry pick failed label Apr 11, 2022
@MiguelCompany
Copy link
Member

@richiprosima Please test this

1 similar comment
@MiguelCompany
Copy link
Member

@richiprosima Please test this

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>
@MiguelCompany MiguelCompany added this to the v2.3.5 milestone Apr 12, 2022
@MiguelCompany MiguelCompany merged commit 7bc01c8 into 2.3.x Apr 12, 2022
@MiguelCompany MiguelCompany deleted the mergify/bp/2.3.x/pr-2626 branch April 12, 2022 14:39
@MiguelCompany
Copy link
Member

@Mergifyio backport 2.2.x

mergify bot added a commit that referenced this pull request Apr 13, 2022
* Fix inconsistent ReaderProxy state on intra-process (#2626)

* Refs #14346. Added regression test.

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

* Refs #14346. Fix bug.

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

# Conflicts:
#	src/cpp/rtps/writer/ReaderProxy.cpp
#	test/blackbox/common/BlackboxTestsPubSubBasic.cpp

* Refs #14349. Fix conflicts.

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

* Refs #14349. Fix build errors.

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

Co-authored-by: Miguel Company <miguelcompany@eprosima.com>
(cherry picked from commit 7bc01c8)
@mergify
Copy link
Contributor Author

mergify bot commented Apr 13, 2022

backport 2.2.x

✅ Backports have been created

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