aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Collect xml results for KokoroMatt Kwong2017-12-206-2/+26
* Make Kokoro job pull Dockerimage from DockerhubMatt Kwong2017-12-202-11/+14
* Migrate Jenkins jobs to KokoroMatt Kwong2017-12-1911-0/+658
* Add Xcode 9.2 to the testing supportThomas Van Lenten2017-12-181-2/+2
* Merge pull request #4053 from xfxyjwf/fixumaskFeng Xiao2017-12-151-0/+1
|\
| * Fix file permission for python package.Feng Xiao2017-12-141-0/+1
* | Merge pull request #4046 from acozzette/deprecated-valueof-issue-2054Adam Cozzette2017-12-141-1/+9
|\ \
| * | Generate an annotation to suppress deprecation warningsAdam Cozzette2017-12-131-1/+9
* | | Merge pull request #4045 from pherl/deprecateJisi Liu2017-12-144-11/+34
|\ \ \ | |/ / |/| |
| * | Fix python descriptor test.Jisi Liu2017-12-141-0/+13
| * | Add deprecation annotation for oneof case.Jisi Liu2017-12-133-11/+21
* | | Add auto-generated header to C# generated files (#4038)Jan Tattermusch2017-12-1322-44/+88
* | | Merge pull request #4044 from xfxyjwf/issue3268Feng Xiao2017-12-1313-39/+39
|\ \ \
| * | | Update generated code.Feng Xiao2017-12-1312-36/+36
| * | | Avoid two consecutive underscores in macro name.Feng Xiao2017-12-131-3/+3
| | |/ | |/|
* | | Merge pull request #4041 from acozzette/fix-license-issue-1775Adam Cozzette2017-12-132-1/+60
|\ \ \
| * | | Added our standard license header to structurally_valid.cc and its testAdam Cozzette2017-12-132-1/+60
| | |/ | |/|
* | | Add unknown field support for csharp (#3936)Jie Luo2017-12-1332-345/+3017
| |/ |/|
* | Merge pull request #4037 from xfxyjwf/issue2880Feng Xiao2017-12-131-4/+4
|\ \ | |/ |/|
| * Clarify default value behavior in JSON conversion.Feng Xiao2017-12-121-4/+4
* | Merge pull request #4036 from xfxyjwf/issue3093Feng Xiao2017-12-123-3/+9
|\ \
| * | Update generated code.Feng Xiao2017-12-122-2/+6
| * | Update comments for Timestamp JSON format.Feng Xiao2017-12-121-1/+3
| |/
* | Merge pull request #4016 from jquesnelle/string-access-ubJisi Liu2017-12-121-4/+5
|\ \
| * | use const char* instead of const std::string& in normalize()Jeffrey Quesnelle2017-12-071-5/+5
| * | fix undefined behavior in C++03Jeffrey Quesnelle2017-12-071-4/+5
* | | Merge pull request #2834 from aj-michael/masterJisi Liu2017-12-121-0/+1
|\ \ \ | |_|/ |/| |
| * | Make //:protobuf_python have correct __init__.py.Adam Michael2017-03-101-0/+1
* | | Regenerated code from previous C# codegen commitJon Skeet2017-12-096-34/+34
* | | C# code generation changes to use bitwise comparisons for doublesJon Skeet2017-12-092-12/+30
* | | Compare floating point values bitwise in C#Jon Skeet2017-12-0911-14/+405
* | | Merge pull request #4007 from graywolf/patch-1Adam Cozzette2017-12-081-4/+0
|\ \ \
| * | | --pre is not necessaryW2017-12-061-4/+0
| | |/ | |/|
* | | Merge pull request #4000 from Kwizatz/masterAdam Cozzette2017-12-081-2/+2
|\ \ \
| * | | Using binary one's complement to negate an unsigned intRodrigo Hernandez2017-12-071-2/+2
* | | | Merge pull request #4017 from acozzette/update-file-listsAdam Cozzette2017-12-082-0/+2
|\ \ \ \
| * | | | Ran update_file_lists.sh to update Bazel and CMake file listsAdam Cozzette2017-12-072-0/+2
| | |/ / | |/| |
* | | | Merge pull request #4018 from acozzette/android-portable-log2-floorAdam Cozzette2017-12-081-4/+12
|\ \ \ \ | |/ / / |/| | |
| * | | Use the portable version of Log2Floor for Clang with older Android NDK versionsAdam Cozzette2017-12-071-4/+12
|/ / /
* | | Merge pull request #3988 from acozzette/down-integrateAdam Cozzette2017-12-05142-3270/+4456
|\ \ \
| * | | Fixed failing JS testsAdam Cozzette2017-12-054-11/+3
| * | | Updated conformance failure listsAdam Cozzette2017-12-043-9/+0
| * | | Updated Makefile.am to add a new file to EXTRA_DISTAdam Cozzette2017-12-011-0/+1
| * | | Merge branch 'master' into down-integrateAdam Cozzette2017-12-01135-5818/+2910
| |\ \ \
| * | | | Integrated internal changes from GoogleAdam Cozzette2017-12-01143-3272/+4483
* | | | | Merge pull request #3926 from BSBandme/down_sync_benchmarkYilun Chong2017-12-0529-464/+8661
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Fix bugs to pass testsYilun Chong2017-12-042-8/+13
| * | | | Sync internal benchmark changesYilun Chong2017-12-0128-459/+8651
| | |/ / | |/| |
* | | | Merge pull request #3968 from fahhem/patch-2Feng Xiao2017-12-042-0/+14
|\ \ \ \
| * | | | Add a check_protobuf_required_bazel_version() for use in WORKSPACEsFahrzin Hemmati2017-12-042-0/+14