Skip to content

api: revert option java_multiple_files = true#5642

Merged
mattklein123 merged 2 commits intoenvoyproxy:masterfrom
dapengzhang0:revert_java_multiple_files
Jan 18, 2019
Merged

api: revert option java_multiple_files = true#5642
mattklein123 merged 2 commits intoenvoyproxy:masterfrom
dapengzhang0:revert_java_multiple_files

Conversation

@dapengzhang0
Copy link
Copy Markdown
Contributor

@dapengzhang0 dapengzhang0 commented Jan 17, 2019 •
edited
Loading

Description:

cd api
for f in $(find . -name "*.proto")
do
  sed -i -e '/^option\sjava_multiple_files\s=/d' $f
done
  • tools/check_format.py is also changed accordingly.

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

@dapengzhang0
api: revert option java_multiple_files = true
041d622 
Signed-off-by: Penn (Dapeng) Zhang <zdapeng@google.com>
@dapengzhang0
more fix on check_format.py
83dc689 
Signed-off-by: Penn (Dapeng) Zhang <zdapeng@google.com>
@dapengzhang0 dapengzhang0 mentioned this pull request Jan 18, 2019
Closed
snowp
snowp approved these changes Jan 18, 2019
View reviewed changes
Copy link
Copy Markdown
Contributor

@snowp snowp 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 fixing this!

@mattklein123 mattklein123 merged commit ca7aed4 into envoyproxy:master Jan 18, 2019
@dapengzhang0 dapengzhang0 deleted the revert_java_multiple_files branch February 8, 2019 18:28
fredlas pushed a commit to fredlas/envoy that referenced this pull request Mar 5, 2019
@dapengzhang0 @fredlas
api: revert option java_multiple_files = true (envoyproxy#5642)
5af41a4 
Signed-off-by: Penn (Dapeng) Zhang <zdapeng@google.com>
Signed-off-by: Fred Douglas <fredlas@google.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

2 more reviewers

@lizan lizan lizan approved these changes

@snowp snowp snowp approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@htuch htuch

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@dapengzhang0 @lizan @snowp @mattklein123 @htuch