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

[8.x](backport #41618) Update catalog-info file with correct system property #41827

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

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 28, 2024

Proposed commit message

Update catalog-info file with correct system property

Checklist

  • My code follows the style guidelines of this project
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • I have made corresponding change to the default configuration files
  • I have added tests that prove my fix is effective or that my feature works
  • I have added an entry in CHANGELOG.next.asciidoc or CHANGELOG-developer.next.asciidoc.

Related issues


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

(cherry picked from commit 47f1502)

# Conflicts:
#	catalog-info.yaml
@mergify mergify bot added the backport label Nov 28, 2024
@mergify mergify bot requested a review from a team as a code owner November 28, 2024 22:00
@mergify mergify bot added the conflicts There is a conflict in the backported pull request label Nov 28, 2024
Copy link
Contributor Author

mergify bot commented Nov 28, 2024

Cherry-pick of 47f1502 has failed:

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

You are currently cherry-picking commit 47f15027a1.
  (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:   catalog-info.yaml

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

@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Nov 28, 2024
@botelastic
Copy link

botelastic bot commented Nov 28, 2024

This pull request doesn't have a Team:<team> label.

Copy link
Contributor Author

mergify bot commented Dec 2, 2024

This pull request has not been merged yet. Could you please review and merge it @ev1yehor? 🙏

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport conflicts There is a conflict in the backported pull request needs_team Indicates that the issue/PR needs a Team:* label
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant