Skip to content

Revert "config: unification of delta and SotW gRPC xDS (#8478)"#8939

Merged
mattklein123 merged 1 commit intomasterfrom
revert_xds
Nov 8, 2019
Merged

Revert "config: unification of delta and SotW gRPC xDS (#8478)"#8939
mattklein123 merged 1 commit intomasterfrom
revert_xds

Conversation

@mattklein123
Copy link
Copy Markdown
Member

This reverts commit 443bc33.

This reverts commit 443bc33.

Signed-off-by: Matt Klein <mklein@lyft.com>
@repokitteh-read-only
Copy link
Copy Markdown

CC @envoyproxy/api-shepherds: Your approval is needed for changes made to api/.

🐱

Caused by: #8939 was opened by mattklein123.

see: more, trace.

@mattklein123
Copy link
Copy Markdown
Member Author

@repokitteh-read-only repokitteh-read-only bot removed the api label Nov 7, 2019
@fredlas
Copy link
Copy Markdown
Contributor

fredlas commented Nov 7, 2019

I think it's better to fix forward than to revert, in this case. There is exactly one problem with it, and it's fixed by the easily verifiable one line change of #8935. Furthermore, this revert will reintroduce a known bug with the old code, described in #8923.

@mattklein123
Copy link
Copy Markdown
Member Author

Sorry @fredlas that's not the way we handle issues like this. We will revert and then we can resubmit the other PR once we agree on the right integration test coverage to prevent the reported issue.

@mattklein123 mattklein123 merged commit df6d3bc into master Nov 8, 2019
@mattklein123 mattklein123 deleted the revert_xds branch November 8, 2019 00:21
mattklein123 pushed a commit that referenced this pull request Nov 12, 2019
… by #8939 (#8974)

Signed-off-by: Fred Douglas <fredlas@google.com>
mattklein123 added a commit that referenced this pull request Nov 15, 2019
…e_names_ (#8918)"

This reverts commit 80aedc1.

Revert "config: rename NewGrpcMuxImpl -> GrpcMuxImpl (#8919)"
This reverts commit 6d50553.

Revert "config: reinstate #8478 (unification of delta and SotW xDS), reverted by #8939 (#8974)"
This reverts commit a37522c.

Signed-off-by: Matt Klein <mklein@lyft.com>
mattklein123 added a commit that referenced this pull request Nov 16, 2019
…e_names_ (#8918)" (#9044)

This reverts commit 80aedc1.

Revert "config: rename NewGrpcMuxImpl -> GrpcMuxImpl (#8919)"
This reverts commit 6d50553.

Revert "config: reinstate #8478 (unification of delta and SotW xDS), reverted by #8939 (#8974)"
This reverts commit a37522c.

Signed-off-by: Matt Klein <mklein@lyft.com>
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