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

[21908] Adjust XML snippets to meet QoS constraints (backport #934) #942

Open
wants to merge 1 commit into
base: 2.14.x
Choose a base branch
from

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Oct 17, 2024

Description

This PR updates the XML snippets to meet the resource limits QoS constraints

@Mergifyio backport 3.0.x 2.14.x 2.10.x 2.6.x

Contributor Checklist

  • Commit messages follow the project guidelines.
  • N/A Code snippets related to the added documentation have been provided.
  • Documentation tests pass locally.
  • Applicable backports have been included in the description.

Reviewer Checklist

  • The PR has a milestone assigned.
  • The title and description correctly express the PR's purpose.
  • Check contributor checklist is correct.
  • CI passes without warnings or errors.

This is an automatic backport of pull request #934 done by [Mergify](https://mergify.com).

* Refs #21908: Adjust XML snippets to meet QoS constraints

Signed-off-by: eProsima <[email protected]>

* Refs #21908: ARS - Revert unnecessary changes

Signed-off-by: eProsima <[email protected]>

* Refs #21908: ARS - Add missing snippet change

Signed-off-by: eProsima <[email protected]>

---------

Signed-off-by: eProsima <[email protected]>
(cherry picked from commit d60571d)

# Conflicts:
#	code/DDSCodeTester.cpp
@mergify mergify bot added the conflicts label Oct 17, 2024
Copy link
Author

mergify bot commented Oct 17, 2024

Cherry-pick of d60571d has failed:

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

You are currently cherry-picking commit d60571d.
  (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:   code/XMLTester.xml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   code/DDSCodeTester.cpp

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

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.

1 participant