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

server.go: refine log when not in online state #693

Merged
merged 4 commits into from
Jul 26, 2019

Conversation

july2993
Copy link
Contributor

@july2993 july2993 commented Jul 25, 2019

What problem does this PR solve?

cherry-pick #688

What is changed and how it works?

pick #688
and fix some wrongly merge code before(2.1 don't use zap and pingcap/log)

Check List

Tests

  • Unit test
  • Integration test
    Code changes

Side effects

Related changes

@july2993
Copy link
Contributor Author

/run-all-tests

Copy link
Contributor

@WangXiangUSTC WangXiangUSTC left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@kennytm
Copy link
Contributor

kennytm commented Jul 26, 2019

Could you fix the PR title?

@july2993 july2993 changed the title Hjh/pick not online log server.go: refine log when not in online state Jul 26, 2019
@july2993
Copy link
Contributor Author

Could you fix the PR title?

fixed

Copy link
Contributor

@kennytm kennytm left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@july2993 july2993 merged commit 939d948 into pingcap:release-2.1 Jul 26, 2019
@july2993 july2993 deleted the hjh/pick_not_online_log branch July 26, 2019 03:49
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.

None yet

3 participants