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.

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

Fix #include in js_generator.cc #2366

Merged

Conversation

jbrianceau
Copy link
Contributor

Reland commit f2885f6 that has been trampled by commit d64a2d9.

Reland commit f2885f6 that has been trampled by commit d64a2d9.
@grpc-kokoro
Copy link

Thanks for your pull request. The automated tests will run as soon as one of the admins verifies this change is ok for us to run on our infrastructure.

1 similar comment
@grpc-kokoro
Copy link

Thanks for your pull request. The automated tests will run as soon as one of the admins verifies this change is ok for us to run on our infrastructure.

@xfxyjwf xfxyjwf merged commit 6e93fa4 into protocolbuffers:master Nov 14, 2016
@acozzette
Copy link
Member

@jbrianceau Sorry about that previous fix getting trampled; for legacy reasons we have a script that (among other things) rewrites include paths to transform our internal codebase into the version on GitHub, and it had a bug that was causing it to rewrite that particular include wrong. I have a fix for that script and so that should prevent this fix from getting overwritten again.

@jbrianceau
Copy link
Contributor Author

No problem @acozzette, I understand.
Also, thanks for the fix 👍

@jbrianceau jbrianceau deleted the reland-fix-include-js-generator branch December 21, 2016 21:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants