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

vendor: update kvproto #6461

Merged
merged 3 commits into from
May 5, 2018
Merged

vendor: update kvproto #6461

merged 3 commits into from
May 5, 2018

Conversation

tiancaiamao
Copy link
Contributor

go-grpc-middleware need to be locked, because it specify a different version of grpc.
I'd like to update kvproto for #6457, and make update get me here.

PTAL @zhexuany @coocood

@tiancaiamao
Copy link
Contributor Author

So I just update kvproto now, manually call

dep ensure -update github.com/pingcap/kvproto
dep prune
./hack/clean_vendor.sh

It seems somebody don't make the right update last time, so some extra files is included after this operation.

@coocood
Copy link
Member

coocood commented May 4, 2018

/run-all-tests

@tiancaiamao tiancaiamao changed the title vendor: lock go-grpc-middleware, make update to get the latest kvproto vendor: update kvproto May 4, 2018
@shenli
Copy link
Member

shenli commented May 4, 2018

But the kvproto in vendor does not changed.

Locked *LockInfo `protobuf:"bytes,1,opt,name=locked" json:"locked,omitempty"`
Retryable string `protobuf:"bytes,2,opt,name=retryable,proto3" json:"retryable,omitempty"`
Abort string `protobuf:"bytes,3,opt,name=abort,proto3" json:"abort,omitempty"`
Conflict *WriteConflict `protobuf:"bytes,4,opt,name=conflict" json:"conflict,omitempty"`
Copy link
Contributor Author

Choose a reason for hiding this comment

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

It's changed @shenli

@coocood
Copy link
Member

coocood commented May 4, 2018

LGTM

Copy link
Contributor

@zhexuany zhexuany left a comment

Choose a reason for hiding this comment

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

LGTM

@zhexuany
Copy link
Contributor

zhexuany commented May 5, 2018

/run-all-tests

@zhexuany zhexuany added the status/LGT2 Indicates that a PR has LGTM 2. label May 5, 2018
@zhexuany zhexuany merged commit b804672 into pingcap:master May 5, 2018
@tiancaiamao tiancaiamao deleted the vendor branch May 5, 2018 06:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
status/LGT2 Indicates that a PR has LGTM 2.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants