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

Manually cp (#1833) (#1831) #1872

Merged
merged 2 commits into from
Mar 6, 2020
Merged

Manually cp (#1833) (#1831) #1872

merged 2 commits into from
Mar 6, 2020

Conversation

Yisaer
Copy link
Contributor

@Yisaer Yisaer commented Mar 5, 2020

git cherry-pick 25f488e
git cherry-pick 1308c28

Yisaer and others added 2 commits March 5, 2020 19:46
…1801)

* Manage hot region label for the tikv created by auto-scaler

Co-authored-by: DanielZhangQD <36026334+DanielZhangQD@users.noreply.github.com>
* mutate

* fix log

* add admission configuration

* remove useless log

* format by comment

* use tikv cli

* remove useless code

* remove cmlister

* fix lint

* fix tpl
@Yisaer
Copy link
Contributor Author

Yisaer commented Mar 5, 2020

/merge

@sre-bot
Copy link
Contributor

sre-bot commented Mar 5, 2020

/run-all-tests

@sre-bot
Copy link
Contributor

sre-bot commented Mar 5, 2020

@Yisaer merge failed.

@Yisaer
Copy link
Contributor Author

Yisaer commented Mar 5, 2020

/run-e2e-in-kind

Copy link
Contributor

@aylei aylei left a comment

Choose a reason for hiding this comment

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

LGTM

@aylei aylei merged commit 5109ed5 into pingcap:release-1.1 Mar 6, 2020
@Yisaer Yisaer changed the title Manually cp 1833 and 1801 Manually cp (#1833) (#1831) Jun 8, 2020
@Yisaer
Copy link
Contributor Author

Yisaer commented Jun 8, 2020

ref #1833 #1831

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants