aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Add python benchmarkYilun Chong2018-01-055-8/+284
* Merge pull request #4014 from BSBandme/JavaCaliperYilun Chong2018-01-037-338/+489
|\
| * Fix some bugYilun Chong2018-01-021-0/+0
| * Changed READMEYilun Chong2018-01-021-11/+12
| * add cppYilun Chong2017-12-143-16/+23
| * Merge branch 'master' of https://github.com/google/protobuf into JavaCaliperYilun Chong2017-12-1368-510/+3708
| |\
| * | fix bugsYilun Chong2017-12-134-4/+4
| * | Fix bugsYilun Chong2017-12-137-157/+81
| * | Add caliper supported to java benchmarkYilun Chong2017-12-129-335/+554
* | | Properly copy maps with string keys but pod values.Thomas Van Lenten2018-01-033-1/+74
* | | Resolved issue #3510. Malformed errorr messages replaced with meaningful desc...kvukic2017-12-291-3/+3
* | | Merge pull request #4083 from matt-kwong/kokoro_jobsFeng Xiao2017-12-2130-0/+390
|\ \ \
| * | | Shard 64-bit Linux languages into different Kokoro jobsMatt Kwong2017-12-2030-0/+390
* | | | Merge pull request #4082 from matt-kwong/kokoro_jobsFeng Xiao2017-12-2011-0/+685
|\| | |
| * | | 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
* | | | Merge pull request #4077 from mkamilov/masterJisi Liu2017-12-201-0/+3
|\ \ \ \
| * | | | Add support for Windows ARM64 buildMiradham Kamilov2017-12-191-0/+3
| |/ / /
* | | | Merge pull request #4030 from cyyber/masterFeng Xiao2017-12-202-13/+7
|\ \ \ \
| * | | | Calling Keychecker before checking key in MessageMapcyyber2017-12-152-13/+7
* | | | | Merge pull request #4068 from wsw2016/fix_4032Adam Cozzette2017-12-202-1/+27
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | line breaks adjstedUbuntu2017-12-201-5/+12
| * | | | formatting issuesUbuntu2017-12-202-8/+11
| * | | | resolve issue 4032 and added a unit testUbuntu2017-12-192-1/+17
|/ / / /
* | | | 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