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.

Sign up for GitHub

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

Jump to bottom

[15163] Backport #2054 to <2.1.x> #2852

Merged
merged 4 commits into from
Jul 21, 2022
Merged

[15163] Backport #2054 to <2.1.x> #2852

merged 4 commits into from
Jul 21, 2022

Conversation

JLBuenoLopez
Copy link
Contributor

Signed-off-by: JLBuenoLopez-eProsima joseluisbueno@eprosima.com

Description

This PR replaces #2595.

Contributor Checklist

  • Commit messages follow the project guidelines.
  • N/A The code follows the style guidelines of this project.
  • N/A Tests that thoroughly check the new feature have been added/Regression tests checking the bug and its fix have been added.
  • N/A Any new/modified methods have been properly documented using Doxygen.
  • N/A Fast DDS test suite has been run locally.
  • N/A Changes are ABI compatible.
  • N/A Changes are API compatible.
  • N/A Documentation builds and tests pass locally.
  • N/A New feature has been added to the versions.md file (if applicable).
  • N/A New feature has been documented/Current behavior is correctly described in the documentation.

Reviewer Checklist

  • Check contributor checklist is correct.
  • Check CI results: changes do not issue any warning.
  • Check CI results: failing tests are unrelated with the changes.

@JLBuenoLopez
Refs #15163: backport #2054 to 2.1.x
fba6e46 
Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>
@JLBuenoLopez JLBuenoLopez added the no-test Skip CI tests if PR marked with this label label Jul 19, 2022
@JLBuenoLopez JLBuenoLopez added this to the v2.1.2 milestone Jul 19, 2022
@JLBuenoLopez JLBuenoLopez mentioned this pull request Jul 19, 2022
Closed
@JLBuenoLopez
Refs #15163: fix RTPSWriter unittest build
0f819e7 
Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>
@JLBuenoLopez
Copy link
Contributor Author

@richiprosima please test this

@JLBuenoLopez
Refs #15163: fix RTPSWriter unittest build (second attempt)
1c29aca 
Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>
@JLBuenoLopez
Copy link
Contributor Author

@richiprosima Please test this

@MiguelCompany
Copy link
Member

@richiprosima Please test windows

@JLBuenoLopez
Copy link
Contributor Author

@richiprosima Please test this

@JLBuenoLopez
Refs #15163: use correct variable name
183202b 
Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>
@JLBuenoLopez JLBuenoLopez force-pushed the backport/2054-2.1.x branch from ce25c34 to 183202b Compare July 21, 2022 09:18
@JLBuenoLopez
Copy link
Contributor Author

@richiprosima Please test this

MiguelCompany
MiguelCompany approved these changes Jul 21, 2022
View reviewed changes
Copy link
Member

@MiguelCompany MiguelCompany left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM with green CI

@MiguelCompany MiguelCompany merged commit 00d2bf7 into 2.1.x Jul 21, 2022
@MiguelCompany MiguelCompany deleted the backport/2054-2.1.x branch July 21, 2022 11:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@MiguelCompany MiguelCompany MiguelCompany approved these changes

Assignees
No one assigned
Labels
no-test Skip CI tests if PR marked with this label
Projects
None yet
Milestone
v2.1.2
Development

Successfully merging this pull request may close these issues.
2 participants
@JLBuenoLopez @MiguelCompany