Skip to content

chore: update copyright for 2025#544

Merged
ldming merged 3 commits intomainfrom
support/update-copyright-for-2025
Jan 24, 2025
Merged

chore: update copyright for 2025#544
ldming merged 3 commits intomainfrom
support/update-copyright-for-2025

Conversation

@ldming
Copy link
Collaborator

@ldming ldming commented Jan 24, 2025

No description provided.

@github-actions github-actions bot added the size/XL Denotes a PR that changes 500-999 lines. label Jan 24, 2025
@codecov-commenter
Copy link

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 41.25%. Comparing base (3717822) to head (3d30e2c).

Additional details and impacted files
@@           Coverage Diff           @@
##             main     #544   +/-   ##
=======================================
  Coverage   41.25%   41.25%           
=======================================
  Files         187      187           
  Lines       25208    25208           
=======================================
  Hits        10400    10400           
  Misses      13632    13632           
  Partials     1176     1176           
Flag Coverage Δ
unittests 41.25% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@ldming ldming merged commit 54db6c5 into main Jan 24, 2025
12 checks passed
@ldming ldming deleted the support/update-copyright-for-2025 branch January 24, 2025 02:11
@github-actions github-actions bot added this to the Release 1.0 milestone Jan 24, 2025
@wangyelei
Copy link
Contributor

/cherry-pick release-1.0

@apecloud-bot
Copy link
Collaborator

🤖 says: Error cherry-picking.

Failed to merge submodule addons (not checked out)
CONFLICT (submodule): Merge conflict in addons
Auto-merging docs/user_docs/cli/kbcli_cluster_create_minio.md
CONFLICT (content): Merge conflict in docs/user_docs/cli/kbcli_cluster_create_minio.md
Auto-merging pkg/action/template/cluster_operations_template.cue
warning: Cannot merge binary files: pkg/cluster/charts/apecloud-mysql.tgz (HEAD vs. 54db6c5 (chore: update copyright for 2025 (#544)))
Auto-merging pkg/cluster/charts/apecloud-mysql.tgz
CONFLICT (content): Merge conflict in pkg/cluster/charts/apecloud-mysql.tgz
warning: Cannot merge binary files: pkg/cluster/charts/elasticsearch.tgz (HEAD vs. 54db6c5 (chore: update copyright for 2025 (#544)))
Auto-merging pkg/cluster/charts/elasticsearch.tgz
CONFLICT (content): Merge conflict in pkg/cluster/charts/elasticsearch.tgz
warning: Cannot merge binary files: pkg/cluster/charts/kafka.tgz (HEAD vs. 54db6c5 (chore: update copyright for 2025 (#544)))
Auto-merging pkg/cluster/charts/kafka.tgz
CONFLICT (content): Merge conflict in pkg/cluster/charts/kafka.tgz
warning: Cannot merge binary files: pkg/cluster/charts/mongodb.tgz (HEAD vs. 54db6c5 (chore: update copyright for 2025 (#544)))
Auto-merging pkg/cluster/charts/mongodb.tgz
CONFLICT (content): Merge conflict in pkg/cluster/charts/mongodb.tgz
warning: Cannot merge binary files: pkg/cluster/charts/mysql.tgz (HEAD vs. 54db6c5 (chore: update copyright for 2025 (#544)))
Auto-merging pkg/cluster/charts/mysql.tgz
CONFLICT (content): Merge conflict in pkg/cluster/charts/mysql.tgz
warning: Cannot merge binary files: pkg/cluster/charts/postgresql.tgz (HEAD vs. 54db6c5 (chore: update copyright for 2025 (#544)))
Auto-merging pkg/cluster/charts/postgresql.tgz
CONFLICT (content): Merge conflict in pkg/cluster/charts/postgresql.tgz
warning: Cannot merge binary files: pkg/cluster/charts/qdrant.tgz (HEAD vs. 54db6c5 (chore: update copyright for 2025 (#544)))
Auto-merging pkg/cluster/charts/qdrant.tgz
CONFLICT (content): Merge conflict in pkg/cluster/charts/qdrant.tgz
warning: Cannot merge binary files: pkg/cluster/charts/redis.tgz (HEAD vs. 54db6c5 (chore: update copyright for 2025 (#544)))
Auto-merging pkg/cluster/charts/redis.tgz
CONFLICT (content): Merge conflict in pkg/cluster/charts/redis.tgzhint: Recursive merging with submodules currently only supports trivial cases.
hint: Please manually handle the merging of each conflicted submodule.
hint: This can be accomplished with the following steps:
hint: - come back to superproject and run:
hint:
hint: git add addons
hint:
hint: to record the above merge or update
hint: - resolve any other conflicts in the superproject
hint: - commit the resulting index in the superproject
hint:
hint: Disable this message with "git config advice.submoduleMergeConflict false"

Auto-merging pkg/cluster/cluster.go
Auto-merging pkg/cmd/cluster/operations.go
Auto-merging pkg/cmd/cluster/operations_test.go
Auto-merging pkg/cmd/componentdefinition/describe.go
Auto-merging pkg/cmd/kubeblocks/kubeblocks_objects.go
Auto-merging pkg/cmd/kubeblocks/kubeblocks_objects_test.go
Auto-merging pkg/testing/fake.go
error: could not apply 54db6c5... chore: update copyright for 2025 (#544)
hint: After resolving the conflicts, mark them with
hint: "git add/rm ", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
hint: Disable this message with "git config advice.mergeConflict false"

@apecloud-bot
Copy link
Collaborator

🤖 says: ‼️ cherry pick action failed.
See: https://github.com/apecloud/kbcli/actions/runs/13170997220

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size/XL Denotes a PR that changes 500-999 lines.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants