aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'google/3.6.x'Feng Xiao2018-09-071-3/+19
|\
| * Merge pull request #5048 from jozefizso/fix/4579_backport_for_3.6.x3.6.xFeng Xiao2018-08-207-4/+80
| |\
| | * Backport the PR #4579 to 3.6.x branchJozef Izso2018-08-157-4/+80
| * | Merge pull request #5049 from nehaljwani/backport-4854Adam Cozzette2018-08-162-4/+4
| |\ \ | | |/ | |/|
| | * Set LIBPROTOBUF_EXPORT on GenericTypeHandler<class google::protobuf::Message>Nehal J Wani2018-08-151-3/+3
| | * Set LIBPROTOBUF_EXPORT on GzipOutputStream::OptionsAdam Cozzette2018-08-151-1/+1
| |/
| * Python wheel kokoro for windows (#5034)Paul Yang2018-08-133-0/+123
| * Python wheel kokoro for mac (#5017)Paul Yang2018-08-082-0/+55
| * Python wheel kokoro dev (#5002)Paul Yang2018-08-063-0/+101
| * Update php package.xml to 3.6.1 (#5000)Paul Yang2018-08-031-3/+19
| * Merge pull request #4997 from jtattermusch/backport_nuget_buildingFeng Xiao2018-08-034-2/+18
| |\
| | * upgrade dotnet SDK to 2.1.3 on kokoro linuxJan Tattermusch2018-08-031-1/+1
| | * Revert "overcome the global.json constraint with a hack"Jan Tattermusch2018-08-031-9/+0
| | * use SDK version available on KokoroJan Tattermusch2018-08-031-1/+1
| | * overcome the global.json constraint with a hackJan Tattermusch2018-08-031-0/+9
| | * fix build_nuget.batJan Tattermusch2018-08-031-1/+1
| | * add scripts for automated building of C# nuget on KokoroJan Tattermusch2018-08-032-0/+16
| |/
* | Merge pull request #5125 from jtattermusch/upport_kokoro_release_pythonJan Tattermusch2018-09-078-0/+279
|\ \
| * | upport kokoro/release/python from 3.6.x branchJan Tattermusch2018-09-078-0/+279
* | | Merge pull request #5109 from haberman/integrateJoshua Haberman2018-09-07364-15969/+15849
|\ \ \ | |/ / |/| |
| * | Fixed Python extension compile.Josh Haberman2018-09-072-7/+7
| * | Regenerated Objective C protos.Josh Haberman2018-09-072-2/+3
| * | Removed obsolete hash_map header that was breaking the compile.Josh Haberman2018-09-071-1/+0
| * | Reverted changes to map_lite_test.proto.Josh Haberman2018-09-071-2/+3
| * | Regenerated C# protos.Josh Haberman2018-09-042-2/+3
| * | Down-integrate from google3.Josh Haberman2018-09-04363-15969/+15847
* | | Merge pull request #5123 from jtattermusch/collect_all_artifactsJan Tattermusch2018-09-072-0/+69
|\ \ \
| * | | experimental collect_all_artifacts scriptJan Tattermusch2018-09-072-0/+69
* | | | Merge pull request #5111 from kykrueger/masterFeng Xiao2018-09-071-1/+13
|\ \ \ \ | |/ / / |/| | |
| * | | Update README.md with gradle instructions for javaKyle Krueger2018-09-061-1/+13
* | | | Add source dependency of test suite implementation to main function (#5069)Paul Yang2018-09-064-230/+202
|/ / /
* | | Merge pull request #5103 from haberman/cmakeJoshua Haberman2018-09-021-0/+1
|\ \ \
| * | | Added conformance test impl file to CMake.Joshua Haberman2018-09-021-0/+1
* | | | Merge pull request #5099 from oqton/feature/issue-5806Feng Xiao2018-09-023-1/+41
|\ \ \ \ | |/ / / |/| | |
| * | | Also make sure known fields come across as expectedBrandon Cole2018-08-301-1/+6
| * | | Code fixes for the original unit test.Brandon Cole2018-08-302-1/+18
| * | | Add unit test for loading unknown fields in Any messagesBrandon Cole2018-08-301-0/+18
| |/ /
* | | Merge pull request #5078 from haberman/conformance-cmakeJoshua Haberman2018-09-023-0/+53
|\ \ \
| * | | Added missing file to Makefile.am.Josh Haberman2018-08-241-0/+1
| * | | Added cmake build files for the conformance test runner.Josh Haberman2018-08-242-0/+52
* | | | Merge pull request #5092 from xfxyjwf/contribFeng Xiao2018-09-011-0/+85
|\ \ \ \
| * | | | Add constributing guidelines.Feng Xiao2018-08-291-0/+85
| | |/ / | |/| |
* | | | Fix well known type class not inheriting Message (#5095)Paul Yang2018-08-312-2/+4
* | | | Add missing reference to conformanc_test_impl.cc in Makefile (#5100)Paul Yang2018-08-313-2/+7
* | | | Merge pull request #5082 from elharo/guavaFeng Xiao2018-08-291-2/+2
|\ \ \ \
| * | | | update versionElliotte Harold2018-08-271-2/+2
| |/ / /
* | | | Merge pull request #5079 from GobySoft/request-new-extensionFeng Xiao2018-08-291-2/+8
|\ \ \ \
| * | | | Update options.mdToby Schneider2018-08-241-2/+8
| |/ / /
* | | | Merge pull request #5077 from EmersonGaziz/patch-1Feng Xiao2018-08-291-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Update options.md | fix website url for C# portGohar Aziz2018-08-241-1/+1
|/ / /