Skip to content
This repository has been archived by the owner on Jun 24, 2024. It is now read-only.

Bump grpc-gateway version #13

Merged
merged 2 commits into from
Dec 23, 2017

Conversation

johanbrandhorst
Copy link
Contributor

Bump grpc-gateway to grpc-ecosystem/grpc-gateway#497 for cockroachdb/cockroach#20983.

Also includes ca29dc9.

@benesch
Copy link
Contributor

benesch commented Dec 22, 2017

This is pushed to origin as branch johanbrandhorst/bump-grpc-gateway.

@johanbrandhorst
Copy link
Contributor Author

Yes.. is that incorrect? I read through the instructions on https://github.com/cockroachdb/cockroach/blob/master/build/README.md#dependencies, was I not supposed to do it like this?

@benesch
Copy link
Contributor

benesch commented Dec 22, 2017

No, you did it exactly right! Unfortunately the instructions are a little bit out of date. I'll merge this PR after your cockroachdb/cockroach PR lands; in the meantime, the existence of the equivalent origin branch means CI will be able to find those commits when you bump the submodule ref in your cockroachdb/cockroach PR.

@johanbrandhorst
Copy link
Contributor Author

I've force pushed to my branch so I think the local copy will need to be updated :(

@johanbrandhorst johanbrandhorst changed the base branch from master to johanbrandhorst/bump-grpc-gateway December 22, 2017 19:12
@johanbrandhorst johanbrandhorst changed the base branch from johanbrandhorst/bump-grpc-gateway to master December 22, 2017 19:13
@johanbrandhorst
Copy link
Contributor Author

Apparently this may not need to be rebased after all, as long as we merge this into master at some point? Submodules confuse me.

@benesch benesch merged commit 82effb8 into cockroachdb:master Dec 23, 2017
@benesch
Copy link
Contributor

benesch commented Dec 23, 2017

Sorry for confusing you by creating a branch! Glad we got this merged.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants