Skip to content

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Jan 9, 2026


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

#2566)

(cherry picked from commit cebe937)

# Conflicts:
#	.metwork-framework/components.md
@mergify mergify bot added the conflicts label Jan 9, 2026
@mergify
Copy link
Contributor Author

mergify bot commented Jan 9, 2026

Cherry-pick of cebe937 has failed:

On branch mergify/bp/release_2.1/pr-2566
Your branch is up to date with 'origin/release_2.1'.

You are currently cherry-picking commit cebe937.
  (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:   layers/layer0_core/0100_redis/Makefile.mk
	modified:   layers/layer0_core/0100_redis/sources

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   .metwork-framework/components.md

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

@sonarqubecloud
Copy link

sonarqubecloud bot commented Jan 9, 2026

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.

2 participants