Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | Remove 2to3 code from setup.py. (#5114) | Benjamin Peterson | 2018-09-10 | 1 | -7/+1 | |
| |_|_|/ / / |/| | | | | | | | | | | | Python protobuf has long been a single-source codebase. 2to3 shouldn't need to run in setup.py. | |||||
* | | | | | | Merge pull request #5125 from jtattermusch/upport_kokoro_release_python | Jan Tattermusch | 2018-09-07 | 8 | -0/+279 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Upport kokoro/release/python from 3.6.x branch | |||||
| * | | | | | | upport kokoro/release/python from 3.6.x branch | Jan Tattermusch | 2018-09-07 | 8 | -0/+279 | |
| | | | | | | | ||||||
* | | | | | | | Merge pull request #5109 from haberman/integrate | Joshua Haberman | 2018-09-07 | 364 | -15969/+15849 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | Down-integrate from google3. | |||||
| * | | | | | | Fixed Python extension compile. | Josh Haberman | 2018-09-07 | 2 | -7/+7 | |
| | | | | | | | ||||||
| * | | | | | | Regenerated Objective C protos. | Josh Haberman | 2018-09-07 | 2 | -2/+3 | |
| | | | | | | | ||||||
| * | | | | | | Removed obsolete hash_map header that was breaking the compile. | Josh Haberman | 2018-09-07 | 1 | -1/+0 | |
| | | | | | | | ||||||
| * | | | | | | Reverted changes to map_lite_test.proto. | Josh Haberman | 2018-09-07 | 1 | -2/+3 | |
| | | | | | | | ||||||
| * | | | | | | Regenerated C# protos. | Josh Haberman | 2018-09-04 | 2 | -2/+3 | |
| | | | | | | | ||||||
| * | | | | | | Down-integrate from google3. | Josh Haberman | 2018-09-04 | 363 | -15969/+15847 | |
| | |_|/ / / | |/| | | | | ||||||
* | | | | | | Merge pull request #5123 from jtattermusch/collect_all_artifacts | Jan Tattermusch | 2018-09-07 | 2 | -0/+69 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Add experimental collect_all_artifacts script | |||||
| * | | | | | | experimental collect_all_artifacts script | Jan Tattermusch | 2018-09-07 | 2 | -0/+69 | |
| | |/ / / / | |/| | | | | ||||||
* | | | | | | Merge pull request #5111 from kykrueger/master | Feng Xiao | 2018-09-07 | 1 | -1/+13 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | Update README.md with gradle instructions for java | |||||
| * | | | | | Update README.md with gradle instructions for java | Kyle Krueger | 2018-09-06 | 1 | -1/+13 | |
| | |/ / / | |/| | | | ||||||
* / | | | | Add source dependency of test suite implementation to main function (#5069) | Paul Yang | 2018-09-06 | 4 | -230/+202 | |
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fix conformance running nothing issue This change adds a source dependency of the test suite implementaion class in the main function. For generality reason, the main function is moved to the file of the test suite implemetation. New test suite implementation will need to implement the main function. In order to make it easy for test suite implementation to implement the main function, this change also refactor out the common code out of the main function. * Fix typo | |||||
* | | | | Merge pull request #5103 from haberman/cmake | Joshua Haberman | 2018-09-02 | 1 | -0/+1 | |
|\ \ \ \ | | | | | | | | | | | Added conformance test impl file to CMake. | |||||
| * | | | | Added conformance test impl file to CMake. | Joshua Haberman | 2018-09-02 | 1 | -0/+1 | |
| | | | | | ||||||
* | | | | | Merge pull request #5099 from oqton/feature/issue-5806 | Feng Xiao | 2018-09-02 | 3 | -1/+41 | |
|\ \ \ \ \ | |/ / / / |/| | | | | Fixes JSON Loading of Any messages with Unknown Fields in C++ | |||||
| * | | | | Also make sure known fields come across as expected | Brandon Cole | 2018-08-30 | 1 | -1/+6 | |
| | | | | | ||||||
| * | | | | Code fixes for the original unit test. | Brandon Cole | 2018-08-30 | 2 | -1/+18 | |
| | | | | | | | | | | | | | | | | | | | | Credit goes to @mercret for the fix. | |||||
| * | | | | Add unit test for loading unknown fields in Any messages | Brandon Cole | 2018-08-30 | 1 | -0/+18 | |
| |/ / / | | | | | | | | | | | | | Use ./tests.sh cpp to run it | |||||
* | | | | Merge pull request #5078 from haberman/conformance-cmake | Joshua Haberman | 2018-09-02 | 3 | -0/+53 | |
|\ \ \ \ | | | | | | | | | | | Added cmake build files for the conformance test runner. | |||||
| * | | | | Added missing file to Makefile.am. | Josh Haberman | 2018-08-24 | 1 | -0/+1 | |
| | | | | | ||||||
| * | | | | Added cmake build files for the conformance test runner. | Josh Haberman | 2018-08-24 | 2 | -0/+52 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | I want to use the conformance tests from upb, which is switching to CMake. | |||||
* | | | | | Merge pull request #5092 from xfxyjwf/contrib | Feng Xiao | 2018-09-01 | 1 | -0/+85 | |
|\ \ \ \ \ | | | | | | | | | | | | | Add contributing guidelines. | |||||
| * | | | | | Add constributing guidelines. | Feng Xiao | 2018-08-29 | 1 | -0/+85 | |
| | |/ / / | |/| | | | ||||||
* | | | | | Fix well known type class not inheriting Message (#5095) | Paul Yang | 2018-08-31 | 2 | -2/+4 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fix well known type class not inheriting Message Previously, well known types only implement Message interface but not inhert it. Fix the problem by calling zend_do_inheritance * Add back commented tests | |||||
* | | | | | Add missing reference to conformanc_test_impl.cc in Makefile (#5100) | Paul Yang | 2018-08-31 | 3 | -2/+7 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add missing reference to conformanc_test_impl.cc in Makefile * Update conformance failure list | |||||
* | | | | | Merge pull request #5082 from elharo/guava | Feng Xiao | 2018-08-29 | 1 | -2/+2 | |
|\ \ \ \ \ | | | | | | | | | | | | | update version | |||||
| * | | | | | update version | Elliotte Harold | 2018-08-27 | 1 | -2/+2 | |
| |/ / / / | ||||||
* | | | | | Merge pull request #5079 from GobySoft/request-new-extension | Feng Xiao | 2018-08-29 | 1 | -2/+8 | |
|\ \ \ \ \ | | | | | | | | | | | | | Request new option extension (and update URLs for existing projects) | |||||
| * | | | | | Update options.md | Toby Schneider | 2018-08-24 | 1 | -2/+8 | |
| |/ / / / | | | | | | | | | | | | | | | | Update my projects' (DCCL / Goby) URLs. Propose new extension for CGSN Mooring project. | |||||
* | | | | | Merge pull request #5077 from EmersonGaziz/patch-1 | Feng Xiao | 2018-08-29 | 1 | -1/+1 | |
|\ \ \ \ \ | |/ / / / |/| | | | | Update options.md | fix website url for C# port | |||||
| * | | | | Update options.md | fix website url for C# port | Gohar Aziz | 2018-08-24 | 1 | -1/+1 | |
|/ / / / | | | | | | | | | Update options.md | fix website url for C# port of protocol buffers.. From `http://github.com/jskeet/dotnet-protobufs` to `https://github.com/jskeet/protobuf-csharp-port` | |||||
* | | | | Merge pull request #5074 from xfxyjwf/links | Feng Xiao | 2018-08-23 | 3 | -4/+4 | |
|\ \ \ \ | | | | | | | | | | | Revert changed links in Dockerfiles. | |||||
| * | | | | Fix go tests. | Feng Xiao | 2018-08-23 | 1 | -1/+1 | |
| | | | | | ||||||
| * | | | | Revert changed links in Dockerfiles. | Feng Xiao | 2018-08-23 | 2 | -3/+3 | |
|/ / / / | | | | | | | | | | | | | | | | | These changes require building new docker images and without new images our kokoro tests are all failing. | |||||
* | | | | Merge pull request #5068 from xfxyjwf/links | Feng Xiao | 2018-08-22 | 52 | -84/+84 | |
|\ \ \ \ | | | | | | | | | | | Replace repo links. | |||||
| * | | | | Replace repo links. | Feng Xiao | 2018-08-22 | 52 | -84/+84 | |
|/ / / / | ||||||
* | | | | Support creating FileDescriptors dynamically from binary data. | Jon Skeet | 2018-08-20 | 6 | -40/+168 | |
| | | | | | | | | | | | | | | | | Related to #658 and #5007. | |||||
* | | | | Merge pull request #5024 from greenhouse-org/fix-windows-path | Feng Xiao | 2018-08-20 | 1 | -1/+2 | |
|\ \ \ \ | | | | | | | | | | | Fix TryCreateParentDirectory on Windows | |||||
| * | | | | Always spilt on '\' and '/' | Sam Smith | 2018-08-13 | 1 | -5/+1 | |
| | | | | | ||||||
| * | | | | Fix TryCreateParentDirectory on Windows | Sam Smith | 2018-08-09 | 1 | -0/+5 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On Windows, both '/' and '\' are valid path separators. So when creating the parent directories, split the filename on both Signed-off-by: Akshat Gokhale <agokhale@pivotal.io> | |||||
* | | | | | Merge pull request #5050 from lucidsoftware/lucid | Feng Xiao | 2018-08-20 | 1 | -1/+1 | |
|\ \ \ \ \ | | | | | | | | | | | | | Change deprecated Bazel single file attr param | |||||
| * | | | | | Change deprecated Bazel single file attr param | James Judd | 2018-08-14 | 1 | -1/+1 | |
|/ / / / / | | | | | | | | | | | | | | | | | | | | | This removes the need for --incompatible_disable_deprecated_attr_params when using Protobuf | |||||
* | | | | | Disable surrogate check for ucs2 (#5039) | Jie Luo | 2018-08-14 | 2 | -3/+10 | |
| | | | | | | | | | | | | | | | | | | | | * _SURROGATE_PATTERN check for ucs4 Skip some test for ucs2 by sys.maxunicode | |||||
* | | | | | Merge pull request #5042 from dsnet/master | Feng Xiao | 2018-08-13 | 1 | -0/+5 | |
|\ \ \ \ \ | | | | | | | | | | | | | Document wrapper non-uses | |||||
| * | | | | | Document wrapper non-uses | Joe Tsai | 2018-08-13 | 1 | -0/+5 | |
|/ / / / / | | | | | | | | | | | | | | | | Document the cases where the wrapper well-known types are not useful. | |||||
* | | | | | Merge pull request #5033 from xfxyjwf/up | Feng Xiao | 2018-08-13 | 1 | -1/+1 | |
|\ \ \ \ \ | | | | | | | | | | | | | Fix issues discovered in up-integration. | |||||
| * | | | | | Fix issues discovered in up-integration. | Feng Xiao | 2018-08-13 | 1 | -1/+1 | |
| | | | | | |