Closed mergify[bot] closed 3 months ago
Cherry-pick of ba567ce22543482d2755ddb49fe97c1fc5233bf9 has failed:
On branch mergify/bp/branch-3.2/pr-47702
Your branch is up to date with 'origin/branch-3.2'.
You are currently cherry-picking commit ba567ce225.
(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: conf/ranger/ranger-servicedef-starrocks.json
new file: fe/fe-core/src/main/java/com/starrocks/privilege/ColumnPrivilege.java
modified: fe/fe-core/src/main/java/com/starrocks/privilege/ranger/hive/RangerHiveAccessController.java
modified: fe/fe-core/src/main/java/com/starrocks/privilege/ranger/starrocks/RangerStarRocksAccessController.java
modified: fe/fe-core/src/main/java/com/starrocks/sql/StatementPlanner.java
Unmerged paths:
(use "git add <file>..." to mark resolution)
both modified: fe/fe-core/src/main/java/com/starrocks/privilege/AccessController.java
both modified: fe/fe-core/src/main/java/com/starrocks/sql/analyzer/Authorizer.java
both modified: fe/fe-core/src/main/java/com/starrocks/sql/analyzer/AuthorizerStmtVisitor.java
both modified: fe/fe-core/src/test/java/com/starrocks/sql/analyzer/PrivilegeCheckerTest.java
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
@mergify[bot]: Backport conflict, please reslove the conflict and resubmit the pr
Issues
0 New issues
0 Accepted issues
Measures
0 Security Hotspots
0.0% Coverage on New Code
0.0% Duplication on New Code
Why I'm doing:
What I'm doing:
Fixes #issue
What type of PR is this:
Does this PR entail a change in behavior?
If yes, please specify the type of change:
Checklist:
Bugfix cherry-pick branch check:
This is an automatic backport of pull request #47702 done by Mergify.
Why I'm doing:
What I'm doing:
Fixes #issue
What type of PR is this:
Does this PR entail a change in behavior?
If yes, please specify the type of change:
Checklist: