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

Keep changes inside instances sorted by source timestamp [12421] (backport #2182) #2189

Merged
merged 3 commits into from
Oct 15, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 6, 2021

This is an automatic backport of pull request #2182 done by Mergify.
Cherry-pick of 38e8d0f has failed:

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

You are currently cherry-picking commit 38e8d0fb7.
  (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:
	new file:   src/cpp/utils/collections/sorted_vector_insert.hpp
	modified:   test/blackbox/common/BlackboxTestsPubSubHistory.cpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   src/cpp/fastrtps_deprecated/subscriber/SubscriberHistory.cpp
	both modified:   src/cpp/rtps/history/ReaderHistory.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.io/

* Refs 12419. Regression test.

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

* Refs 12419. Added sorted_vector_insert utility method.

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

* Refs 12419. ReaderHistory uses sorted_vector_insert.

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

* Refs 12419. SubscriberHistory uses sorted_vector_insert.

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

* Refs 12421. Uncrustify.

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

* Refs 12421. Apply suggestions

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

* Refs 12421. Moved new template method to correct namespace.

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

# Conflicts:
#	src/cpp/fastrtps_deprecated/subscriber/SubscriberHistory.cpp
#	src/cpp/rtps/history/ReaderHistory.cpp
@mergify mergify bot added the conflicts Backport PR wich git cherry pick failed label Sep 6, 2021
@MiguelCompany MiguelCompany added this to the v2.1.2 milestone Sep 27, 2021
Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>
Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>
@MiguelCompany
Copy link
Member

@richiprosima Please test linux

@MiguelCompany MiguelCompany merged commit a0dbf66 into 2.1.x Oct 15, 2021
@MiguelCompany MiguelCompany deleted the mergify/bp/2.1.x/pr-2182 branch October 15, 2021 09:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
conflicts Backport PR wich git cherry pick failed
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant