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

[20401] Improve History QoS documentation and compatibility rules (backport #664) #677

Merged
merged 3 commits into from
Apr 16, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Feb 20, 2024

This is an automatic backport of pull request #664 done by Mergify.
Cherry-pick of 157375d has failed:

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

You are currently cherry-picking commit 157375d.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   docs/fastdds/dds_layer/core/policy/standardQosPolicies.rst

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/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

* Refs #20401: Improve History documentation

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>

* Refs #20401: Update example to out last standard tabs format

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>

* Refs #20401: Update all file examples

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>

* Refs #20401: Add NIT to explanation

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>

* Refs #20401: Fix doc tab

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>

* Refs #20401: Apply spaces rev suggestion

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>

* Refs #20401: Apply documentation rev suggestions

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>

* Refs #20401: Apply documentation update based on internal discussion

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>

* Refs #20401: Remove old explanation

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>

* Refs #20401: Improve documentation

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>

* Refs #20401: Apply NIT

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>

---------

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>
(cherry picked from commit 157375d)

# Conflicts:
#	docs/fastdds/dds_layer/core/policy/standardQosPolicies.rst
Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>
Mario-DL
Mario-DL previously approved these changes Feb 21, 2024
Signed-off-by: EduPonz <eduardoponz@eprosima.com>
@Mario-DL
Copy link
Member

Mario-DL commented Mar 1, 2024

@richiprosima please test docs

@Mario-DL Mario-DL merged commit cce9059 into 2.6.x Apr 16, 2024
4 checks passed
@Mario-DL Mario-DL deleted the mergify/bp/2.6.x/pr-664 branch April 16, 2024 13:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants