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: fix tipb depency version. #7653

Merged
merged 2 commits into from
Sep 10, 2018
Merged

vendor: fix tipb depency version. #7653

merged 2 commits into from
Sep 10, 2018

Conversation

lysu
Copy link
Contributor

@lysu lysu commented Sep 10, 2018

What problem does this PR solve?

fixes vendor question introduced by #7596 which confict with pingcap/tipb#102

In master, run dep ensure should not modify vendor, and it seems vendor code is unconsistent to tipb

What is changed and how it works?

  • remove github.com/pingcap/tip in Gopkg.lock
  • dep ensure -add github.com/pingcap/tipb/go-tipb

Check List

Tests

  • Unit test

Code changes

  • No code

Side effects

  • No

Related changes

  • No

This change is Reviewable

@lysu
Copy link
Contributor Author

lysu commented Sep 10, 2018

/run-all-tests

@lysu lysu added the type/bugfix This PR fixes a bug. label Sep 10, 2018
@lysu lysu changed the title vendor: fix tipb dep version. vendor: fix tipb depency version. Sep 10, 2018
@lysu
Copy link
Contributor Author

lysu commented Sep 10, 2018

need help @coocood @zhexuany PTAL thx~

@coocood
Copy link
Member

coocood commented Sep 10, 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

@lysu
Copy link
Contributor Author

lysu commented Sep 10, 2018

/run-common-test

@coocood
Copy link
Member

coocood commented Sep 10, 2018

/run-common-test tidb-test=pr/620

@coocood
Copy link
Member

coocood commented Sep 10, 2018

/run-integration-common-test tidb-test=pr/620

@lysu
Copy link
Contributor Author

lysu commented Sep 10, 2018

/run-common-test tidb-test=pr/620

@lysu
Copy link
Contributor Author

lysu commented Sep 10, 2018

/run-common-test
/run-integration-common-test

@lysu lysu merged commit f312000 into pingcap:master Sep 10, 2018
@lysu lysu deleted the fix-tipb-dep branch September 27, 2018 04:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
type/bugfix This PR fixes a bug.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants