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

[19576] Updatable disable_positive_acks period (backport #3879) #3895

Merged
merged 3 commits into from
Oct 26, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 2, 2023

This is an automatic backport of pull request #3879 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

* Refs #19576: Test Update positive_acks period on RTPS Layer

Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>

* Refs #19567: Fix Update positive_acks period on RTPS Layer

Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>

* Refs #19576: Test Update positive_acks period on DDS Layer

Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>

* Refs #19576: Fix ack_timer and Updatability of positive_acks on DDS Layer

Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>

* Refs #19576: Uncrustify fix

Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>

* Refs #19576: Fix linux ci

Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>

* Ref #19576: DataReaderImpl update and updateAttributes call

Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>

* Refs #19576: Fix mac-ci

Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>

* Refs #19576: move if clause

Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>

---------

Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>
(cherry picked from commit b84825a)
@JLBuenoLopez JLBuenoLopez added this to the v2.11.3 milestone Oct 3, 2023
@JLBuenoLopez
Copy link
Contributor

@richiprosima please test this

@JLBuenoLopez JLBuenoLopez added needs-review PR that is ready to be reviewed ci-pending PR which CI is running labels Oct 3, 2023
cferreiragonz
cferreiragonz previously approved these changes Oct 3, 2023
@cferreiragonz cferreiragonz removed the needs-review PR that is ready to be reviewed label Oct 3, 2023
@JLBuenoLopez
Copy link
Contributor

@richiprosima please test this

@Mario-DL
Copy link
Member

Mario-DL commented Oct 9, 2023

Cherry picking the merge commit of #3915 needed

* Refs #19687. Add regression test.

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

* Refs #19687. Rename argument.

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

* Refs #19687. Refactor on DataWriterImpl::set_qos.

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

---------

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

@richiprosima Please test this

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

@richiprosima Please test this

@JLBuenoLopez
Copy link
Contributor

@richiprosima please test mac

2 similar comments
@JLBuenoLopez
Copy link
Contributor

@richiprosima please test mac

@JLBuenoLopez
Copy link
Contributor

@richiprosima please test mac

@JLBuenoLopez
Copy link
Contributor

Mac failure seems unrelated.

@JLBuenoLopez JLBuenoLopez 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 Oct 26, 2023
@MiguelCompany MiguelCompany merged commit bd34703 into 2.11.x Oct 26, 2023
6 of 12 checks passed
@MiguelCompany MiguelCompany deleted the mergify/bp/2.11.x/pr-3879 branch October 26, 2023 17:17
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.

4 participants