Skip to content

Fix overload manager unit test build#4022

Merged
mattklein123 merged 1 commit intoenvoyproxy:masterfrom
eziskind:overloadfix
Aug 1, 2018
Merged

Fix overload manager unit test build#4022
mattklein123 merged 1 commit intoenvoyproxy:masterfrom
eziskind:overloadfix

Conversation

@eziskind
Copy link
Contributor

@eziskind eziskind commented Aug 1, 2018

Fix build failure caused by conflicting PRs #4001 and #4004.

Signed-off-by: Elisha Ziskind eziskind@google.com

Signed-off-by: Elisha Ziskind <eziskind@google.com>
Copy link
Contributor

@dnoe dnoe 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 quick fix!

@mattklein123 mattklein123 merged commit 891135e into envoyproxy:master Aug 1, 2018
@eziskind eziskind deleted the overloadfix branch August 1, 2018 20:18
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.

5 participants