aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | 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
| | | | | | | | | | | | | | | | | | | | I want to use the conformance tests from upb, which is switching to CMake.
* | | | Merge pull request #5092 from xfxyjwf/contribFeng Xiao2018-09-011-0/+85
|\ \ \ \ | | | | | | | | | | Add contributing guidelines.
| * | | | Add constributing guidelines.Feng Xiao2018-08-291-0/+85
| | |/ / | |/| |
* | | | Fix well known type class not inheriting Message (#5095)Paul Yang2018-08-312-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 Yang2018-08-313-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | * Add missing reference to conformanc_test_impl.cc in Makefile * Update conformance failure list
* | | | Merge pull request #5082 from elharo/guavaFeng Xiao2018-08-291-2/+2
|\ \ \ \ | | | | | | | | | | update version
| * | | | update versionElliotte Harold2018-08-271-2/+2
| |/ / /
* | | | Merge pull request #5079 from GobySoft/request-new-extensionFeng Xiao2018-08-291-2/+8
|\ \ \ \ | | | | | | | | | | Request new option extension (and update URLs for existing projects)
| * | | | Update options.mdToby Schneider2018-08-241-2/+8
| |/ / / | | | | | | | | | | | | Update my projects' (DCCL / Goby) URLs. Propose new extension for CGSN Mooring project.
* | | | Merge pull request #5077 from EmersonGaziz/patch-1Feng Xiao2018-08-291-1/+1
|\ \ \ \ | |/ / / |/| | | Update options.md | fix website url for C# port
| * | | Update options.md | fix website url for C# portGohar Aziz2018-08-241-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/linksFeng Xiao2018-08-233-4/+4
|\ \ \ | | | | | | | | Revert changed links in Dockerfiles.
| * | | Fix go tests.Feng Xiao2018-08-231-1/+1
| | | |
| * | | Revert changed links in Dockerfiles.Feng Xiao2018-08-232-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/linksFeng Xiao2018-08-2252-84/+84
|\ \ \ | | | | | | | | Replace repo links.
| * | | Replace repo links.Feng Xiao2018-08-2252-84/+84
|/ / /
* | | Support creating FileDescriptors dynamically from binary data.Jon Skeet2018-08-206-40/+168
| | | | | | | | | | | | Related to #658 and #5007.
* | | Merge pull request #5024 from greenhouse-org/fix-windows-pathFeng Xiao2018-08-201-1/+2
|\ \ \ | | | | | | | | Fix TryCreateParentDirectory on Windows
| * | | Always spilt on '\' and '/'Sam Smith2018-08-131-5/+1
| | | |
| * | | Fix TryCreateParentDirectory on WindowsSam Smith2018-08-091-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/lucidFeng Xiao2018-08-201-1/+1
|\ \ \ \ | | | | | | | | | | Change deprecated Bazel single file attr param
| * | | | Change deprecated Bazel single file attr paramJames Judd2018-08-141-1/+1
|/ / / / | | | | | | | | | | | | | | | | This removes the need for --incompatible_disable_deprecated_attr_params when using Protobuf
* | | | Disable surrogate check for ucs2 (#5039)Jie Luo2018-08-142-3/+10
| | | | | | | | | | | | | | | | * _SURROGATE_PATTERN check for ucs4 Skip some test for ucs2 by sys.maxunicode
* | | | Merge pull request #5042 from dsnet/masterFeng Xiao2018-08-131-0/+5
|\ \ \ \ | | | | | | | | | | Document wrapper non-uses
| * | | | Document wrapper non-usesJoe Tsai2018-08-131-0/+5
|/ / / / | | | | | | | | | | | | Document the cases where the wrapper well-known types are not useful.
* | | | Merge pull request #5033 from xfxyjwf/upFeng Xiao2018-08-131-1/+1
|\ \ \ \ | | | | | | | | | | Fix issues discovered in up-integration.
| * | | | Fix issues discovered in up-integration.Feng Xiao2018-08-131-1/+1
| | | | |
* | | | | Merge pull request #5041 from xfxyjwf/bazelFeng Xiao2018-08-132-2/+2
|\ \ \ \ \ | |/ / / / |/| | | | Add status badge for bazel build.
| * | | | Add status badge for bazel build.Feng Xiao2018-08-132-2/+2
|/ / / /
* | | | Merge pull request #5040 from xfxyjwf/bazelFeng Xiao2018-08-134-2/+11
|\ \ \ \ | | | | | | | | | | Fix bazel test.
| * | | | Update build files.Feng Xiao2018-08-134-2/+11
|/ / / / | | | | | | | | | | | | | | | | * Fixes https://github.com/google/protobuf/issues/5031 * Fixes https://github.com/google/protobuf/issues/5037
* | | | Merge pull request #5038 from xfxyjwf/proto2Feng Xiao2018-08-1338-124/+125
|\ \ \ \ | | | | | | | | | | Down-integrate proto2 namespace fix.
| * | | | Down-integrate proto2 namespace fix.Feng Xiao2018-08-1338-124/+125
| | | | |
* | | | | Merge pull request #5032 from TeBoring/json-wrapperJoshua Haberman2018-08-133-221/+589
|\ \ \ \ \ | |/ / / / |/| | | | Fix json parsing of wrapper values
| * | | | Fix json parsing of wrapper valuesBo Yang2018-08-103-221/+589
| | | | |
* | | | | Merge pull request #4951 from BSBandme/add_js_benchmarkYilun Chong2018-08-106-2/+266
|\ \ \ \ \ | | | | | | | | | | | | Add JS and Protobuf.js benchmark, fix js's reader.skipGroup
| * | | | | fix filename and newlineYilun Chong2018-08-085-12/+15
| | | | | |
| * | | | | Add JS and Protobuf.js benchmarkYilun Chong2018-07-206-2/+263
| | | | | |
* | | | | | Fix failing tests.Feng Xiao2018-08-0922-34/+728
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Fix C++ tests. * Add missing files to Makefile.am and fix distcheck in tests.sh * Remove BUILT_SOURCES from conformance/Makefile.am. * Add some missing override keyword. * Add a type cast to int64 because our StrCat() in stubs can't handle size_t. 2. Fix Java tests. * Add missing test dependency on guava in pom.xml. * Include newly referenced test data in test resources. * Manually fix map_lite_test.proto which is overwritten because it's mapped from map_test.proto in google3. * Add back "optimize_for = LITE_RUNTIME" which is still needed to keep the opensource test passing as it's still running lite tests. * Add a type cast in newBuilder() because without it the code doesn't compile with openjdk javac 1.8 (the compiler can't figure if it's the right type due to complex generic typing). 3. Fix Python tests. * Remove/replace references to <hash_map>. * Suppress more warnings in setup.py. * Replace incorrect header inclusion for google/protobuf/proto_api.h. * Add strings::EndsWith to google/protobuf/stubs/strutil.h because it's referenced in the updated python C extension code. * Replace proto2 with google::protobuf. The proto2 name is leaked to opensource because we removed the subsitition rule for proto2 namespace but only fixed C++ source code and forgot to update python C extension code.
* | | | | | Merge remote-tracking branch 'google/master' into integration_baseintegration_baseFeng Xiao2018-08-094-64/+7
|\ \ \ \ \ \
| * \ \ \ \ \ Merge pull request #5027 from xfxyjwf/jenkinsFeng Xiao2018-08-093-63/+6
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Cleanup kokoro scripts.
| | * | | | | | Cleanup kokoro scripts.Feng Xiao2018-08-093-63/+6
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes: 1. Remove stuff no longer needed. Lots of the heavy lifting were there because we were running our own jenkins cluster and had to manage all the test logs ourselves. Now they are useless. 2. Change "-j2" to "-j4" to speed up the test a little bit. Kokoro machines have 4 logic CPUs according to their spec.
| * | | | | | Merge pull request #5020 from brian-peloton/masterFeng Xiao2018-08-081-1/+1
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | Fix broken test of const repeated field iterators
| | * | | | | Fix broken test of const repeated field iteratorsBrian Silverman2018-08-081-1/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The old version had a NOP for loop, which doesn't make sense. I'm pretty sure this was the original intention. Newer GCC's -Wunused-but-set-variable flags the old version.
* | | | | | Update generated descriptors.integrationFeng Xiao2018-08-0815-65/+243
| | | | | |
* | | | | | Merge master branch.Feng Xiao2018-08-0885-379/+525
|\| | | | |
| * | | | | Merge pull request #4981 from BSBandme/fix_js_skipgroupYilun Chong2018-08-083-9/+21
| |\ \ \ \ \ | | | | | | | | | | | | | | Fix js reader.js's skipGroup
| | * | | | | fixYilun Chong2018-08-011-1/+6
| | | | | | |
| | * | | | | fixYilun Chong2018-08-011-1/+6
| | | | | | |
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-29 00:22:35 +0000