Skip to content

[release-1.6] manual cherry-pick of https://github.com/envoyproxy/env…#195

Merged
howardjohn merged 1 commit intomasterfrom
flatbuffer_impl_1_6
Apr 17, 2020
Merged

[release-1.6] manual cherry-pick of https://github.com/envoyproxy/env…#195
howardjohn merged 1 commit intomasterfrom
flatbuffer_impl_1_6

Conversation

@kyessenov
Copy link
Copy Markdown

…oy-wasm/pull/482

Signed-off-by: Kuat Yessenov kuat@google.com

For an explanation of how to fill out the fields, please see the relevant section
in PULL_REQUESTS.md

Description:
Risk Level:
Testing:
Docs Changes:
Release Notes:
[Optional Fixes #Issue]
[Optional Deprecated:]

Signed-off-by: Kuat Yessenov <kuat@google.com>
@kyessenov
Copy link
Copy Markdown
Author

@howardjohn can you use superpowers to merge this? It's a cherry-pick.

@howardjohn
Copy link
Copy Markdown
Member

Why are we cherrypicking to master instead of just syncing up to head of envoy?

@kyessenov
Copy link
Copy Markdown
Author

Envoy head and envoy-wasm diverged. Wasm changes do not automatically get merged.

@kyessenov
Copy link
Copy Markdown
Author

See previous discussion. proxy-wasm is a breaking change in envoy-wasm and we chose to use pre-proxy-wasm for 1.6.

@howardjohn howardjohn merged commit aba3cf3 into master Apr 17, 2020
@delete-merged-branch delete-merged-branch bot deleted the flatbuffer_impl_1_6 branch April 17, 2020 22:15
@howardjohn
Copy link
Copy Markdown
Member

Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants