Skip to content

Conversation

markatou
Copy link
Contributor

@markatou markatou commented Aug 6, 2018

Resolving the conflict and reverting the revert.

…proxy#4063)"

This reverts commit 4e52589.

Signed-off-by: Lilika Markatou <lilika@google.com>
Signed-off-by: Lilika Markatou <lilika@google.com>
Envoy::Server::Configuration::TransportSocketFactoryContextImpl factory_context(
ssl_context_manager, *scope, cm, local_info, dispatcher, random, stats);

auto transport_socket = cluster.transport_socket();
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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>
Copy link
Member

@htuch htuch left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the cleanup.

@htuch htuch merged commit fccaead into envoyproxy:master Aug 7, 2018
@markatou markatou deleted the revert_revert branch August 7, 2018 17:53
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