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.

Sign up for GitHub

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

Jump to bottom

*: replace conf item pprof_sql_cpu with srv var tidb_pprof_sql_cpu (#14385) #14416

Merged
merged 2 commits into from
Jan 11, 2020
Merged

*: replace conf item pprof_sql_cpu with srv var tidb_pprof_sql_cpu (#14385) #14416

merged 2 commits into from
Jan 11, 2020

Conversation

lysu
Copy link
Contributor

@lysu lysu commented Jan 9, 2020 •
edited
Loading

cherry-pick #14385 to 3.0

This change is Reviewable

@lysu lysu added type/enhancement The issue or PR belongs to an enhancement. component/server type/3.0 cherry-pick labels Jan 9, 2020
jackysp
jackysp reviewed Jan 9, 2020
View reviewed changes
Copy link
Member

@jackysp jackysp left a comment

Choose a reason for hiding this comment

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

LGTM

@jackysp jackysp added the status/LGT1 Indicates that a PR has LGTM 1. label Jan 9, 2020
zz-jason
zz-jason approved these changes Jan 10, 2020
View reviewed changes
Copy link
Member

@zz-jason zz-jason left a comment

Choose a reason for hiding this comment

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

LGTM

@zz-jason zz-jason added status/can-merge Indicates a PR has been approved by a committer. status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Jan 10, 2020
@sre-bot
Copy link
Contributor

sre-bot commented Jan 10, 2020

Your auto merge job has been accepted, waiting for 14435, 14386

@sre-bot
Copy link
Contributor

sre-bot commented Jan 10, 2020

/run-all-tests

@lysu
Copy link
Contributor Author

lysu commented Jan 11, 2020

/merge

@sre-bot
Copy link
Contributor

sre-bot commented Jan 11, 2020

Sorry @lysu, you don't have permission to trigger auto merge event on this branch.

@zz-jason zz-jason merged commit f0678b4 into pingcap:release-3.0 Jan 11, 2020
@bb7133 bb7133 added this to the v3.0.10 milestone Jan 16, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jackysp jackysp jackysp left review comments

@zz-jason zz-jason zz-jason approved these changes

@SunRunAway SunRunAway Awaiting requested review from SunRunAway

Assignees
No one assigned
Labels
component/server status/can-merge Indicates a PR has been approved by a committer. status/LGT2 Indicates that a PR has LGTM 2. type/enhancement The issue or PR belongs to an enhancement.
Projects
None yet
Milestone
v3.0.10
Development

Successfully merging this pull request may close these issues.
5 participants
@lysu @sre-bot @jackysp @zz-jason @bb7133