Skip to content
This repository has been archived by the owner on Nov 24, 2023. It is now read-only.

cherry-pick #575 and #578 to release-1.0 and resolve conflicts #616

Merged
merged 3 commits into from
Apr 17, 2020

Conversation

csuzhangxc
Copy link
Member

@csuzhangxc csuzhangxc commented Apr 17, 2020

What problem does this PR solve?

cherry-pick #575 and #578 to release-1.0 and resolve conflicts

What is changed and how it works?

cherry-pick #575 and #578 to release-1.0 and resolve conflicts

Check List

Tests

  • Unit test
  • Integration test

Code changes

  • Has exported function/method change
  • Has exported variable/fields change
  • Has interface methods change
  • Has persistent data change

Side effects

  • Possible performance regression
  • Increased code complexity

Related changes

  • Need to be included in the release note

@csuzhangxc csuzhangxc added priority/normal Minor change, requires approval from ≥1 primary reviewer status/PTAL This PR is ready for review. Add this label back after committing new changes type/cherry-pick This PR is just a cherry-pick (backport) needs-update-release-note This PR should be added into release notes. Remove this label once the release notes are updated labels Apr 17, 2020
@codecov
Copy link

codecov bot commented Apr 17, 2020

Codecov Report

Merging #616 into release-1.0 will increase coverage by 0.4111%.
The diff coverage is 88.7179%.

@@                 Coverage Diff                 @@
##           release-1.0       #616        +/-   ##
===================================================
+ Coverage      57.2631%   57.6743%   +0.4111%     
===================================================
  Files              161        166         +5     
  Lines            16742      16933       +191     
===================================================
+ Hits              9587       9766       +179     
- Misses            6207       6219        +12     
  Partials           948        948                

@csuzhangxc
Copy link
Member Author

@WangXiangUSTC @lichunzhu PTAL

@WangXiangUSTC
Copy link
Contributor

LGTM

@WangXiangUSTC WangXiangUSTC added status/LGT1 One reviewer already commented LGTM and removed status/PTAL This PR is ready for review. Add this label back after committing new changes labels Apr 17, 2020
Copy link
Contributor

@lichunzhu lichunzhu left a comment

Choose a reason for hiding this comment

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

LGTM

@lichunzhu lichunzhu merged commit 7dec1e5 into pingcap:release-1.0 Apr 17, 2020
@csuzhangxc csuzhangxc deleted the pick-575 branch April 17, 2020 09:57
@csuzhangxc csuzhangxc added already-update-release-note The release note is updated. Add this label once the release note is updated and removed needs-update-release-note This PR should be added into release notes. Remove this label once the release notes are updated labels Jun 17, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
already-update-release-note The release note is updated. Add this label once the release note is updated priority/normal Minor change, requires approval from ≥1 primary reviewer status/LGT1 One reviewer already commented LGTM type/cherry-pick This PR is just a cherry-pick (backport)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants