aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* fix typo in FieldMaskTree.java commentkenji yoshida2018-01-221-1/+1
|
* Add DiscardUnknownFields support for C#Jon Skeet2018-01-155-56/+173
| | | | | | | By default, unknown fields are preserved when parsing. To discard them, use a parser configured to do so: var parser = MyMessage.Parser.WithDiscardUnknownFields(true);
* Merge pull request #4158 from BSBandme/FixBenchmarksYilun Chong2018-01-106-62/+60
|\ | | | | Fix java benchmark to use parser, fix cpp benchmark new arena to use …
| * Update py_benchmark.pyYilun Chong2018-01-101-1/+1
| |
| * Fix java benchmark to use parser, fix cpp benchmark new arena to use Reset, ↵Yilun Chong2018-01-096-61/+59
|/ | | | format some files
* Merge pull request #4148 from datacompboy/patch-2Adam Cozzette2018-01-081-0/+53
|\ | | | | Add more tests to time_test
| * Update time_test.ccAnton Fedorov2018-01-051-0/+53
| | | | | | Better test coverage for datetime validation.
* | Merge pull request #4147 from datacompboy/patch-1Adam Cozzette2018-01-081-2/+2
|\ \ | | | | | | Fix ValidateDateTime: check day instead month
| * | Fix ValidateDateTime: check day instead monthAnton Fedorov2018-01-051-2/+2
| |/ | | | | | | Found with PVS-Studio static analyser, see https://www.viva64.com/en/b/0550/
* | Merge pull request #4132 from BSBandme/JavaCaliperCounterYilun Chong2018-01-052-12/+64
|\ \ | | | | | | Java caliper counter
| * | Add counter to Java benchmarkYilun Chong2018-01-052-12/+64
| | |
* | | Merge pull request #4065 from BSBandme/python_benchmark_realYilun Chong2018-01-055-8/+284
|\ \ \ | |_|/ |/| | Add python benchmark
| * | Add python benchmarkYilun Chong2018-01-055-8/+284
| |/
* | Merge pull request #4131 from pherl/mergeJisi Liu2018-01-0455-218/+853
|\ \ | | | | | | Merge 3.5.x branch into master
| * \ Merge remote-tracking branch 'origin/3.5.x' into masterJisi Liu2018-01-032-7/+4
| |\ \
| | * \ Merge pull request #4124 from pherl/nullptrJisi Liu2018-01-031-1/+1
| | |\ \ | | | | | | | | | | remove nullptr
| | | * | remove nullptrJisi Liu2018-01-021-1/+1
| | | | |
| | * | | Merge pull request #4090 from pherl/nopasswordJisi Liu2018-01-031-6/+3
| | |\ \ \ | | | |/ / | | |/| | Fix uploading binary wheel.
| | | * | Fix uploading binary wheel.Jisi Liu2017-12-221-6/+3
| | | | | | | | | | | | | | | | | | | | | | | | | The script now takes two prompt for user name and password. One single input redirection no longer works.
| * | | | Merge remote-tracking branch 'origin/3.5.x' into masterJisi Liu2018-01-0354-212/+850
| |\| | |
| | * | | Merge pull request #4089 from pherl/nocacheJisi Liu2017-12-221-1/+2
| | |\| | | | | | | | | | | | Disable pip cache when testing uploaded packages
| | | * | Disable pip cache when testing uploaded packagesJisi Liu2017-12-221-1/+2
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | Otherwise, pip complains "cannot find a version satisfies the requirement." I suspect it was due to caching issues. I usued to manually add a `sleep 30` between the upload and the installation test which is quite unstable.
| | * | Merge pull request #4073 from pherl/changelogv3.5.1Jisi Liu2017-12-201-0/+31
| | |\ \ | | | | | | | | | | Update changelog for 3.5.1
| | | * | Update changelogJisi Liu2017-12-201-1/+1
| | | | |
| | | * | Update changelogJisi Liu2017-12-191-2/+7
| | | | |
| | | * | Merge branch '3.5.x' of github.com:google/protobuf into changelogJisi Liu2017-12-1926-28/+28
| | | |\ \
| | | * | | Update changelog for 3.5.1Jisi Liu2017-12-191-0/+26
| | | | | |
| | * | | | Merge pull request #4080 from pherl/arm64Jisi Liu2017-12-201-0/+3
| | |\ \ \ \ | | | | | | | | | | | | | | Add support for Windows ARM64 build
| | | * | | | Add support for Windows ARM64 buildMiradham Kamilov2017-12-201-0/+3
| | | | |/ / | | | |/| |
| | * | | | Merge pull request #4072 from google/jieluoJisi Liu2017-12-1955-769/+4529
| | |\ \ \ \ | | | | | | | | | | | | | | Cherrypick for csharp, including:
| | | * | | | Cherrypick for csharp, including:Jie Luo2017-12-1955-769/+4529
| | | | |/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Add preserve UnknownFields Compare floating point values bitwise Add auto-generated header to C# generated files
| | * | | | Merge pull request #4076 from pherl/stringbackJisi Liu2017-12-191-1/+1
| | |\ \ \ \ | | | |_|/ / | | |/| | | Fix string::back() usage in googletest.cc
| | | * | | Fix string::back() usage in googletest.ccJisi Liu2017-12-191-1/+1
| | |/ / /
| | * | | Merge pull request #4074 from pherl/mapatJisi Liu2017-12-191-1/+1
| | |\ \ \ | | | | | | | | | | | | Replace C++11 only method std::map::at
| | | * | | Replace C++11 only method std::map::atJisi Liu2017-12-191-1/+1
| | | |/ /
| | * | | Merge pull request #4070 from pherl/3.5.xJisi Liu2017-12-1925-27/+27
| | |\ \ \ | | | |/ / | | |/| | Update version number to 3.5.1
| | | * | Update version number to 3.5.1Jisi Liu2017-12-1925-27/+27
| | |/ /
| | * | Fix file permission for python package.Feng Xiao2017-12-151-0/+1
| | | | | | | | | | | | | | | | `umask 0022` makes sure the created package will be accessible by all users.
| | * | Merge pull request #4034 from TeBoring/php-timestamp-bugPaul Yang2017-12-154-16/+84
| | |\ \ | | | | | | | | | | Avoid calling method from php extension directly
| | | * | Fix for php5.5Bo Yang2017-12-141-1/+1
| | | | |
| | | * | Accept DatetimeInterface in fromDatetimeBo Yang2017-12-142-12/+14
| | | | |
| | | * | Avoid using php_date_get_date_ce() in case date extension is notBo Yang2017-12-131-2/+15
| | | | | | | | | | | | | | | | | | | | available.
| | | * | Call php method via function name instead of calling directly.Bo Yang2017-12-124-34/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This changes the linking error if php extension is not statically linked to a runtime error. In this way, users who don't need Timestamp can still use protobuf even if date extension is not statically linked in php.
| | | * | Replace private timelib_update_ts with public date_timestamp_getBo Yang2017-12-122-5/+31
| | | | |
| | | * | Add PROTOBUF_ENABLE_TIMESTAMP to let user decide whether timestamp utilBo Yang2017-12-122-2/+13
| | | | | | | | | | | | | | | | | | | | can be used at install time.
| | * | | Merge pull request #4040 from bazurbat/3.5.xAdam Cozzette2017-12-151-0/+1
| | |\ \ \ | | | | | | | | | | | | Create containing directory before generating well_known_types_embed.cc
| | | * | | Create containing directory before generating well_known_types_embed.ccOleg Kolosov2017-12-131-0/+1
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes the following build error: oldpwd=`pwd` && cd .../protobuf/src && \ $oldpwd/js_embed google/protobuf/compiler/js/well_known_types/any.js google/protobuf/compiler/js/well_known_types/struct.js google/protobuf/compiler/js/well_known_types/timestamp.js > $oldpwd/google/protobuf/compiler/js/well_known_types_embed.cc /bin/bash: line 1: .../protobuf/target/src/google/protobuf/compiler/js/well_known_types_embed.cc: No such file or directory Makefile:8201: recipe for target 'google/protobuf/compiler/js/well_known_types_embed.cc' failed which is observed during the cross-compilation since the version 3.2.
| | * | | Merge pull request #4049 from pherl/py26Jisi Liu2017-12-141-1/+0
| | |\ \ \ | | | | | | | | | | | | Remove py2.6 support.
| | | * | | Remove py2.6 support.Jisi Liu2017-12-141-1/+0
| | | | | |
| | * | | | Merge pull request #4042 from pherl/cpp_enumJisi Liu2017-12-131-9/+9
| | |\ \ \ \ | | | | | | | | | | | | | | Use matching enum type for IsPOD.
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-16 05:50:03 +0000