Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Down Integrate Internal Changes #6869

Merged
merged 5 commits into from
Nov 12, 2019
Merged

Down Integrate Internal Changes #6869

merged 5 commits into from
Nov 12, 2019

Conversation

rafi-kamal
Copy link
Contributor

No description provided.

@rafi-kamal rafi-kamal requested a review from TeBoring November 12, 2019 06:36
@rafi-kamal rafi-kamal mentioned this pull request Nov 12, 2019
Closed
@rafi-kamal
Copy link
Contributor Author

rafi-kamal commented Nov 12, 2019 •
edited
Loading

A new file (java/lite/proguard.pgcfg) has been added in this release, I was getting an error that the file is not in EXTRA_DIST. But now I'm getting a new error that there is no make rule for this file.

@TeBoring @haberman do you know how to fix this issue?

@rafi-kamal
Copy link
Contributor Author

I've removed java/lite/proguard.pgcfg from dist to fix the Kokoro tests.

@rafi-kamal rafi-kamal merged commit 9b0fa3e into protocolbuffers:master Nov 12, 2019
@rafi-kamal rafi-kamal mentioned this pull request Nov 13, 2019
Closed
@rafi-kamal rafi-kamal deleted the 201911111645 branch November 15, 2019 00:22
@stanley-cheung stanley-cheung mentioned this pull request May 21, 2020
Merged
@mrdaliri mrdaliri mentioned this pull request Jul 2, 2020
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@gerben-s gerben-s gerben-s approved these changes

@TeBoring TeBoring Awaiting requested review from TeBoring

@anandolee anandolee Awaiting requested review from anandolee

@haberman haberman Awaiting requested review from haberman

Assignees
No one assigned
Labels
cla: yes
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@rafi-kamal @gerben-s @googlebot @protobuf-kokoro @m0hamed