Revert "Revert "Basic Implementation of HDS (#3973)" (#4063)"#4068
Merged
htuch merged 4 commits intoenvoyproxy:masterfrom Aug 7, 2018
Merged
Revert "Revert "Basic Implementation of HDS (#3973)" (#4063)"#4068htuch merged 4 commits intoenvoyproxy:masterfrom
htuch merged 4 commits intoenvoyproxy:masterfrom
Conversation
…proxy#4063)" This reverts commit 4e52589. Signed-off-by: Lilika Markatou <lilika@google.com>
Signed-off-by: Lilika Markatou <lilika@google.com>
htuch
suggested changes
Aug 7, 2018
| Envoy::Server::Configuration::TransportSocketFactoryContextImpl factory_context( | ||
| ssl_context_manager, *scope, cm, local_info, dispatcher, random, stats); | ||
|
|
||
| auto transport_socket = cluster.transport_socket(); |
Member
There was a problem hiding this comment.
This seems to be the meat of the change, I think it would be ideal to refactor this into a utility shared with other cluster implementations, since this seems shared code. Can you do this and also fix the merge conflicts? Thanks.
Signed-off-by: Lilika Markatou <lilika@google.com>
Signed-off-by: Lilika Markatou <lilika@google.com>
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 join this conversation on GitHub.
Already have an account?
Sign in to comment
3 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.
Resolving the conflict and reverting the revert.