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

Fix etcd module #44

Merged
merged 1 commit into from
Oct 14, 2019
Merged

Fix etcd module #44

merged 1 commit into from
Oct 14, 2019

Conversation

amyangfei
Copy link
Contributor

fix dumplicated etcd import, which may lead to

panic: proto: duplicate enum registered: authpb.Permission_Type

Copy link
Contributor

@suzaku suzaku left a comment

Choose a reason for hiding this comment

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

LGTM

@zier-one
Copy link
Contributor

LGTM

@suzaku suzaku added the LGT1 label Oct 14, 2019
@amyangfei amyangfei added status/ptal Could you please take a look? and removed LGT1 labels Oct 14, 2019
@suzaku suzaku added LGT2 and removed status/ptal Could you please take a look? labels Oct 14, 2019
@amyangfei amyangfei merged commit 01dbf34 into pingcap:master Oct 14, 2019
@amyangfei amyangfei deleted the fix-etcd branch October 14, 2019 08:16
5kbpers pushed a commit to 5kbpers/ticdc that referenced this pull request Aug 24, 2020
amyangfei added a commit to amyangfei/tiflow that referenced this pull request May 6, 2022
* [resource manager]: add separated resouce manager interface

* fix merge conflicts

* address comments

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

Successfully merging this pull request may close these issues.

3 participants