chore: resolve conflict when sync master to develop #591
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
release: prepare for release v1.5.0
…t-permission fix: delete created object by authorized account
…ck-shadowobject fix: unlock shadow-object balance when a bucket is force deleted
fix: disallow update payment address when there are created/updating objects
…ck-shadowobject fix: disallow copy an object is being updated
release: prepare for v1.5.0
unclezoro
approved these changes
Mar 14, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
resolve conflict when sync master to develop
Rationale
tell us why we need these changes...
Example
add an example CLI or API response...
Changes
Notable changes:
Potential Impacts