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

Fix resetting of LivelinessLostStatus::total_changes [14984] (backport #2782) #2835

Merged
merged 2 commits into from
Jul 22, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 13, 2022

This is an automatic backport of pull request #2782 done by Mergify.
Cherry-pick of b5f87dd has failed:

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

You are currently cherry-picking commit b5f87dd5c.
  (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/publisher/DataWriterImpl.hpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   src/cpp/fastdds/publisher/DataWriterImpl.cpp

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

@mergify mergify bot added the conflicts Backport PR wich git cherry pick failed label Jul 13, 2022
@JLBuenoLopez JLBuenoLopez added this to the v2.3.5 milestone Jul 21, 2022
richiware and others added 2 commits July 21, 2022 15:00
* Refs #14982. Fix `DataWriter::get_liveliness_lost_status()`

* Apply suggestions from code review

Co-authored-by: Eduardo Ponz Segrelles <eduardoponz@eprosima.com>

Co-authored-by: Eduardo Ponz Segrelles <eduardoponz@eprosima.com>
(cherry picked from commit b5f87dd)

# Conflicts:
#	src/cpp/fastdds/publisher/DataWriterImpl.cpp
Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>
Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>
@JLBuenoLopez
Copy link
Contributor

@richiprosima please test this

@MiguelCompany
Copy link
Member

@richiprosima Please test mac

@JLBuenoLopez JLBuenoLopez removed the conflicts Backport PR wich git cherry pick failed label Jul 21, 2022
@JLBuenoLopez
Copy link
Contributor

@richiprosima please test mac

@JLBuenoLopez JLBuenoLopez added the ready-to-merge Ready to be merged. CI and changes have been reviewed and approved. label Jul 22, 2022
@JLBuenoLopez
Copy link
Contributor

CI failures are unrelated

@MiguelCompany MiguelCompany merged commit 5617bdf into 2.3.x Jul 22, 2022
@MiguelCompany MiguelCompany deleted the mergify/bp/2.3.x/pr-2782 branch July 22, 2022 05:10
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