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

[BugFix] Consistency checker should use local time zone (backport #45749) #45825

Merged
merged 2 commits into from
May 17, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 17, 2024

Fixes #45748

What type of PR is this:

  • BugFix
  • Feature
  • Enhancement
  • Refactor
  • UT
  • Doc
  • Tool

Does this PR entail a change in behavior?

  • Yes, this PR will result in a change in behavior.
  • No, this PR will not result in a change in behavior.

If yes, please specify the type of change:

  • Interface/UI changes: syntax, type conversion, expression evaluation, display information
  • Parameter changes: default values, similar parameters but with different default values
  • Policy changes: use new policy to replace old one, functionality automatically enabled
  • Feature removed
  • Miscellaneous: upgrade & downgrade compatibility, etc.

Checklist:

  • I have added test cases for my bug fix or my new feature
  • This pr needs user documentation (for new or modified features or behaviors)
    • I have added documentation for my new feature or new function
  • This is a backport pr

Bugfix cherry-pick branch check:

  • I have checked the version labels which the pr will be auto-backported to the target branch
    • 3.3
    • 3.2
    • 3.1
    • 3.0
    • 2.5

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

What type of PR is this:

  • BugFix
  • Feature
  • Enhancement
  • Refactor
  • UT
  • Doc
  • Tool

Does this PR entail a change in behavior?

  • Yes, this PR will result in a change in behavior.
  • No, this PR will not result in a change in behavior.

If yes, please specify the type of change:

  • Interface/UI changes: syntax, type conversion, expression evaluation, display information
  • Parameter changes: default values, similar parameters but with different default values
  • Policy changes: use new policy to replace old one, functionality automatically enabled
  • Feature removed
  • Miscellaneous: upgrade & downgrade compatibility, etc.

Checklist:

  • I have added test cases for my bug fix or my new feature
  • This pr needs user documentation (for new or modified features or behaviors)
    • I have added documentation for my new feature or new function
  • This is a backport pr

Signed-off-by: Dejun Xia <[email protected]>
(cherry picked from commit 78c5593)

# Conflicts:
#	fe/fe-core/src/main/java/com/starrocks/consistency/ConsistencyChecker.java
@mergify mergify bot added the conflicts label May 17, 2024
Copy link
Contributor Author

mergify bot commented May 17, 2024

Cherry-pick of 78c5593 has failed:

On branch mergify/bp/branch-2.5/pr-45749
Your branch is up to date with 'origin/branch-2.5'.

You are currently cherry-picking commit 78c55933d6.
  (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:   fe/fe-core/src/main/java/com/starrocks/consistency/ConsistencyChecker.java

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

Copy link
Contributor Author

mergify bot commented May 17, 2024

@mergify[bot]: Backport conflict, please reslove the conflict and resubmit the pr

auto-merge was automatically disabled May 17, 2024 07:23

Pull request was closed

@mergify mergify bot deleted the mergify/bp/branch-2.5/pr-45749 branch May 17, 2024 07:24
@nshangyiming nshangyiming restored the mergify/bp/branch-2.5/pr-45749 branch May 17, 2024 07:34
@nshangyiming nshangyiming reopened this May 17, 2024
@wanpengfei-git wanpengfei-git enabled auto-merge (squash) May 17, 2024 07:35
Copy link

sonarcloud bot commented May 17, 2024

@wanpengfei-git wanpengfei-git merged commit ae99244 into branch-2.5 May 17, 2024
32 of 33 checks passed
@wanpengfei-git wanpengfei-git deleted the mergify/bp/branch-2.5/pr-45749 branch May 17, 2024 07:52
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