Skip to content

api: update to envoyproxy/envoy@ca7aed4#88

Merged
snowp merged 4 commits intoenvoyproxy:masterfrom
dapengzhang0:revert
Jan 30, 2019
Merged

api: update to envoyproxy/envoy@ca7aed4#88
snowp merged 4 commits intoenvoyproxy:masterfrom
dapengzhang0:revert

Conversation

@dapengzhang0
Copy link
Copy Markdown
Contributor

Update to envoyproxy/envoy@ca7aed4

This reverts the option java_multiple_files=true added to api proto files, which caused #87.
Should be able to fix #87.

The update is done by modifying tools/API_SHAS, then running tools/update-api.sh, and then refactoring.

Signed-off-by: Penn (Dapeng) Zhang <zdapeng@google.com>
Signed-off-by: Penn (Dapeng) Zhang <zdapeng@google.com>
Signed-off-by: Penn (Dapeng) Zhang <zdapeng@google.com>
@snowp
Copy link
Copy Markdown
Contributor

snowp commented Jan 25, 2019

@dapengzhang0 Can you check CI?

@jakubdyszkiewicz
Copy link
Copy Markdown
Contributor

I think it's because of the removed --v2-config-only options in launch_envoy.sh
/usr/local/bin/envoy --drain-time-s 1 --v2-config-only -c "${CONFIG_FILE}" "$@"

@snowp
Copy link
Copy Markdown
Contributor

snowp commented Jan 30, 2019

@dapengzhang0 Merged in a fix to the CI failure, so if you merge master this should go green. Up to you whether you want to land this before the other Envoy proto update lands or if you want to just do one big update.

…lane into revert

Signed-off-by: dapengzhang0 <zdapeng@google.com>
@dapengzhang0
Copy link
Copy Markdown
Contributor Author

Thanks. Let me try to merge this and fix the master build first.

@snowp snowp merged commit 72fed97 into envoyproxy:master Jan 30, 2019
@dapengzhang0 dapengzhang0 deleted the revert branch February 8, 2019 18:28
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.

api not compiling

3 participants