-
Notifications
You must be signed in to change notification settings - Fork 15.5k
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
Merge3.4 #3739
Merged
Merged
Merge3.4 #3739
Changes from 30 commits
Commits
Show all changes
31 commits
Select commit
Hold shift + click to select a range
55fdbe5
Make distcheck aware of test proto files.
liujisi 07de70e
Merge pull request #3555 from pherl/fixdist
liujisi 78432ea
Remove pre-installed softwares
matt-kwong 92ea0d2
Merge pull request #3556 from matt-kwong/kokoro_mac_v3
liujisi d8c6193
Add mising cmake files in dist
liujisi 21b2372
Merge pull request #3565 from pherl/fixdist
liujisi 2807436
change the field number of php_generic_service to fix the conflict wi…
TeBoring 50a6475
Google.Protobuf should target net45
jtattermusch 6a4ffb2
Merge pull request #3596 from jtattermusch/csharp_target_net45
jtattermusch e5d000c
Add prefix to php reserved keywords.
TeBoring 89069de
Change array to associate array.
TeBoring ddb9ef9
Change array to map for reserved names in c extension
TeBoring f46a01d
Exclude valid constant name from reserved name.
TeBoring 2bd55a9
Fix js conformance tests. (#3604)
TeBoring a425dd9
Rename ClassNamePrefix to ConstantNamePrefix
TeBoring 8741da3
Revert "Fix js conformance tests. (#3604)" (#3633)
TeBoring c1dd8e8
Move parse frame array to the Map object
tenderlove a459b22
Storing the frame on the map means we don't need the array
tenderlove 3d78561
Merge pull request #3634 from TeBoring/ruby-bug
TeBoring dba647a
Bump version for minor release
liujisi b04e5cb
Merge pull request #3642 from pherl/3.4.x
liujisi 5dd818c
Merge pull request #3612 from TeBoring/php-bug
TeBoring 2eb1bac
Bumping minor version for ruby gems
liujisi 655cc83
Merge pull request #3651 from pherl/3.4.x
liujisi 6d0cf1b
Remove ranged based for in io_win32.cc
liujisi 5a501c6
Fix C++11 string accessors
liujisi d2738c0
Add spaces
liujisi a38f876
Merge pull request #3691 from pherl/stringback
liujisi bd798df
Merge pull request #3690 from pherl/3.4.x
liujisi de15e73
Merge remote-tracking branch 'origin/3.4.x' into master
liujisi dd980cc
Fix distcheck
liujisi File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You probably also need to add new files after running generate_descriptor_proto
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good catch. The distcheck tests will probably catch other new files if there are any.