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

Replace controller.Int32Ptr with k8s.io/utils/pointer.Int32Ptr (#2841) #2845

Merged
merged 2 commits into from
Jul 1, 2020

Conversation

ti-srebot
Copy link
Contributor

cherry-pick #2841 to release-1.1


What problem does this PR solve?

Resolve #2836

What is changed and how does it work?

Replace controller.Int32Ptr with k8s.io/utils/pointer.Int32Ptr

Check List

Tests

  • Unit test
  • E2E test
  • Stability test

Related changes

  • Need to cherry-pick to the release branch

Does this PR introduce a user-facing change?:

NONE

Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@cofyc
Copy link
Contributor

cofyc commented Jul 1, 2020

@lichunzhu can you cherry-pick it manually? the refactor PR #2841 changed the code which only goes into v1.2, so the automatic cherry-picked PR has conflicts in release-1.1.

@lichunzhu
Copy link
Contributor

@lichunzhu can you cherry-pick it manually? the refactor PR #2841 changed the code which only goes into v1.2, so the automatic cherry-picked PR has conflicts in release-1.1.

okay

@cofyc
Copy link
Contributor

cofyc commented Jul 1, 2020

I deleted the file tikv_group_member_manager.go, maybe we can resolve the conflicts on the GitHub website. We can see if the CI can pass now.

@cofyc
Copy link
Contributor

cofyc commented Jul 1, 2020

it seems all goes well

@cofyc
Copy link
Contributor

cofyc commented Jul 1, 2020

/merge

@ti-srebot
Copy link
Contributor Author

/run-all-tests

@ti-srebot
Copy link
Contributor Author

@ti-srebot merge failed.

@cofyc
Copy link
Contributor

cofyc commented Jul 1, 2020

/merge

@ti-srebot
Copy link
Contributor Author

/run-all-tests

@ti-srebot ti-srebot merged commit 217dffa into pingcap:release-1.1 Jul 1, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CanMerge status/PTAL PR needs to be reviewed
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants