aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | Remove 2to3 code from setup.py. (#5114)Benjamin Peterson2018-09-101-7/+1
| |_|_|/ / / |/| | | | |
* | | | | | 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
|/ / / /
* | | | Merge pull request #5074 from xfxyjwf/linksFeng Xiao2018-08-233-4/+4
|\ \ \ \
| * | | | Fix go tests.Feng Xiao2018-08-231-1/+1
| * | | | Revert changed links in Dockerfiles.Feng Xiao2018-08-232-3/+3
|/ / / /
* | | | Merge pull request #5068 from xfxyjwf/linksFeng Xiao2018-08-2252-84/+84
|\ \ \ \
| * | | | Replace repo links.Feng Xiao2018-08-2252-84/+84
|/ / / /
* | | | Support creating FileDescriptors dynamically from binary data.Jon Skeet2018-08-206-40/+168
* | | | Merge pull request #5024 from greenhouse-org/fix-windows-pathFeng Xiao2018-08-201-1/+2
|\ \ \ \
| * | | | Always spilt on '\' and '/'Sam Smith2018-08-131-5/+1
| * | | | Fix TryCreateParentDirectory on WindowsSam Smith2018-08-091-0/+5
* | | | | Merge pull request #5050 from lucidsoftware/lucidFeng Xiao2018-08-201-1/+1
|\ \ \ \ \
| * | | | | Change deprecated Bazel single file attr paramJames Judd2018-08-141-1/+1
|/ / / / /
* | | | | Disable surrogate check for ucs2 (#5039)Jie Luo2018-08-142-3/+10
* | | | | Merge pull request #5042 from dsnet/masterFeng Xiao2018-08-131-0/+5
|\ \ \ \ \
| * | | | | Document wrapper non-usesJoe Tsai2018-08-131-0/+5
|/ / / / /
* | | | | Merge pull request #5033 from xfxyjwf/upFeng Xiao2018-08-131-1/+1
|\ \ \ \ \
| * | | | | Fix issues discovered in up-integration.Feng Xiao2018-08-131-1/+1