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

[15155] Fixed validation on ParameterPropertyList_t (backport #2837) #2863

Merged
merged 2 commits into from
Aug 1, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 21, 2022

This is an automatic backport of pull request #2837 done by Mergify.
Cherry-pick of 50c1ee5 has failed:

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

You are currently cherry-picking commit 50c1ee531.
  (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/core/policy/ParameterSerializer.hpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   test/unittest/rtps/builtin/BuiltinDataSerializationTests.cpp
	both modified:   test/unittest/rtps/builtin/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

* Fixed validation on ParameterPropertyList_t

Signed-off-by: Miguel Company <[email protected]>

* Refs #15155. Added regression test.

Signed-off-by: Miguel Company <[email protected]>
(cherry picked from commit 50c1ee5)

# Conflicts:
#	test/unittest/rtps/builtin/BuiltinDataSerializationTests.cpp
#	test/unittest/rtps/builtin/CMakeLists.txt
@mergify mergify bot added the conflicts Backport PR wich git cherry pick failed label Jul 21, 2022
@MiguelCompany MiguelCompany added this to the v2.1.3 milestone Jul 21, 2022
Signed-off-by: Miguel Company <[email protected]>
@MiguelCompany MiguelCompany removed to-do conflicts Backport PR wich git cherry pick failed labels Jul 29, 2022
@MiguelCompany
Copy link
Member

@richiprosima Please test this

@MiguelCompany MiguelCompany merged commit 84b35ee into 2.1.x Aug 1, 2022
@MiguelCompany MiguelCompany deleted the mergify/bp/2.1.x/pr-2837 branch August 1, 2022 06:02
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