This repository was archived by the owner on Dec 16, 2022. It is now read-only.
Slack upstream sync 08.31.2017#37
Merged
demmer merged 3 commits intoslack-new-masterfrom Aug 31, 2017
Merged
Conversation
For both vttablet and vtgate, add options to the grpc.Dial call site that pass through the max message size option and thereby override the 4MB default.
|
+1 |
demmer
force-pushed
the
slack-new-master-08.31.2017
branch
from
1d544c9 to
833c842
Compare
|
+1 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Preparation branch for the next upstream sync.
The latest upstream commit is 24c74fc tagged with slack-vitess-08.31.2017r0-upstream.
I force pushed that commit to the
slack-new-masterbranch.This shows all the upstream changes that we are pulling in:
tinyspeck:slack-vitess-082117r0-upstream...tinyspeck:slack-vitess-08.31.2017r0-upstream
These are the slack-specific patches on top of that.
As in #34, this also includes:
e1a81a1 make grpc max message size options apply to the client as well
4031aaf redact out the /txlogz endpoint completely
I did not include this since it should now be covered by the actual upstream fixes for upsert (vitessio#3066):
88860e5
insert ignorehack for vindex lookup to be updatedI also added the following:
1d544c9 redact out the /debug/consolidations UI