Skip to content

Conversation

zuercher
Copy link
Member

@zuercher zuercher commented Aug 6, 2018

This reverts commit f3b0f85.

Signed-off-by: Stephan Zuercher stephan@turbinelabs.io

This reverts commit f3b0f85.

Signed-off-by: Stephan Zuercher <stephan@turbinelabs.io>
@zuercher
Copy link
Member Author

zuercher commented Aug 6, 2018

@markatou Unfortunately, your change in combination with #4026 breaks the build.

@zuercher zuercher merged commit 4e52589 into envoyproxy:master Aug 6, 2018
@zuercher zuercher deleted the stephan/revert-hds branch August 6, 2018 21:38
markatou added a commit to markatou/envoy that referenced this pull request Aug 6, 2018
…proxy#4063)"

This reverts commit 4e52589.

Signed-off-by: Lilika Markatou <lilika@google.com>
htuch pushed a commit that referenced this pull request Aug 7, 2018
Resolving the conflict and reverting the revert.

Signed-off-by: Lilika Markatou <lilika@google.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.

2 participants