Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix java benchmark to use parser, fix cpp benchmark new arena to use Reset, ↵ | Yilun Chong | 2018-01-09 | 6 | -61/+59 |
| | | | | format some files | ||||
* | Merge pull request #4148 from datacompboy/patch-2 | Adam Cozzette | 2018-01-08 | 1 | -0/+53 |
|\ | | | | | Add more tests to time_test | ||||
| * | Update time_test.cc | Anton Fedorov | 2018-01-05 | 1 | -0/+53 |
| | | | | | | Better test coverage for datetime validation. | ||||
* | | Merge pull request #4147 from datacompboy/patch-1 | Adam Cozzette | 2018-01-08 | 1 | -2/+2 |
|\ \ | | | | | | | Fix ValidateDateTime: check day instead month | ||||
| * | | Fix ValidateDateTime: check day instead month | Anton Fedorov | 2018-01-05 | 1 | -2/+2 |
| |/ | | | | | | | Found with PVS-Studio static analyser, see https://www.viva64.com/en/b/0550/ | ||||
* | | Merge pull request #4132 from BSBandme/JavaCaliperCounter | Yilun Chong | 2018-01-05 | 2 | -12/+64 |
|\ \ | | | | | | | Java caliper counter | ||||
| * | | Add counter to Java benchmark | Yilun Chong | 2018-01-05 | 2 | -12/+64 |
| | | | |||||
* | | | Merge pull request #4065 from BSBandme/python_benchmark_real | Yilun Chong | 2018-01-05 | 5 | -8/+284 |
|\ \ \ | |_|/ |/| | | Add python benchmark | ||||
| * | | Add python benchmark | Yilun Chong | 2018-01-05 | 5 | -8/+284 |
| |/ | |||||
* | | Merge pull request #4131 from pherl/merge | Jisi Liu | 2018-01-04 | 55 | -218/+853 |
|\ \ | | | | | | | Merge 3.5.x branch into master | ||||
| * \ | Merge remote-tracking branch 'origin/3.5.x' into master | Jisi Liu | 2018-01-03 | 2 | -7/+4 |
| |\ \ | |||||
| | * \ | Merge pull request #4124 from pherl/nullptr | Jisi Liu | 2018-01-03 | 1 | -1/+1 |
| | |\ \ | | | | | | | | | | | remove nullptr | ||||
| | | * | | remove nullptr | Jisi Liu | 2018-01-02 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Merge pull request #4090 from pherl/nopassword | Jisi Liu | 2018-01-03 | 1 | -6/+3 |
| | |\ \ \ | | | |/ / | | |/| | | Fix uploading binary wheel. | ||||
| | | * | | Fix uploading binary wheel. | Jisi Liu | 2017-12-22 | 1 | -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 master | Jisi Liu | 2018-01-03 | 54 | -212/+850 |
| |\| | | | |||||
| | * | | | Merge pull request #4089 from pherl/nocache | Jisi Liu | 2017-12-22 | 1 | -1/+2 |
| | |\| | | | | | | | | | | | | Disable pip cache when testing uploaded packages | ||||
| | | * | | Disable pip cache when testing uploaded packages | Jisi Liu | 2017-12-22 | 1 | -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.1 | Jisi Liu | 2017-12-20 | 1 | -0/+31 |
| | |\ \ | | | | | | | | | | | Update changelog for 3.5.1 | ||||
| | | * | | Update changelog | Jisi Liu | 2017-12-20 | 1 | -1/+1 |
| | | | | | |||||
| | | * | | Update changelog | Jisi Liu | 2017-12-19 | 1 | -2/+7 |
| | | | | | |||||
| | | * | | Merge branch '3.5.x' of github.com:google/protobuf into changelog | Jisi Liu | 2017-12-19 | 26 | -28/+28 |
| | | |\ \ | |||||
| | | * | | | Update changelog for 3.5.1 | Jisi Liu | 2017-12-19 | 1 | -0/+26 |
| | | | | | | |||||
| | * | | | | Merge pull request #4080 from pherl/arm64 | Jisi Liu | 2017-12-20 | 1 | -0/+3 |
| | |\ \ \ \ | | | | | | | | | | | | | | | Add support for Windows ARM64 build | ||||
| | | * | | | | Add support for Windows ARM64 build | Miradham Kamilov | 2017-12-20 | 1 | -0/+3 |
| | | | |/ / | | | |/| | | |||||
| | * | | | | Merge pull request #4072 from google/jieluo | Jisi Liu | 2017-12-19 | 55 | -769/+4529 |
| | |\ \ \ \ | | | | | | | | | | | | | | | Cherrypick for csharp, including: | ||||
| | | * | | | | Cherrypick for csharp, including: | Jie Luo | 2017-12-19 | 55 | -769/+4529 |
| | | | |/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Add preserve UnknownFields Compare floating point values bitwise Add auto-generated header to C# generated files | ||||
| | * | | | | Merge pull request #4076 from pherl/stringback | Jisi Liu | 2017-12-19 | 1 | -1/+1 |
| | |\ \ \ \ | | | |_|/ / | | |/| | | | Fix string::back() usage in googletest.cc | ||||
| | | * | | | Fix string::back() usage in googletest.cc | Jisi Liu | 2017-12-19 | 1 | -1/+1 |
| | |/ / / | |||||
| | * | | | Merge pull request #4074 from pherl/mapat | Jisi Liu | 2017-12-19 | 1 | -1/+1 |
| | |\ \ \ | | | | | | | | | | | | | Replace C++11 only method std::map::at | ||||
| | | * | | | Replace C++11 only method std::map::at | Jisi Liu | 2017-12-19 | 1 | -1/+1 |
| | | |/ / | |||||
| | * | | | Merge pull request #4070 from pherl/3.5.x | Jisi Liu | 2017-12-19 | 25 | -27/+27 |
| | |\ \ \ | | | |/ / | | |/| | | Update version number to 3.5.1 | ||||
| | | * | | Update version number to 3.5.1 | Jisi Liu | 2017-12-19 | 25 | -27/+27 |
| | |/ / | |||||
| | * | | Fix file permission for python package. | Feng Xiao | 2017-12-15 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | `umask 0022` makes sure the created package will be accessible by all users. | ||||
| | * | | Merge pull request #4034 from TeBoring/php-timestamp-bug | Paul Yang | 2017-12-15 | 4 | -16/+84 |
| | |\ \ | | | | | | | | | | | Avoid calling method from php extension directly | ||||
| | | * | | Fix for php5.5 | Bo Yang | 2017-12-14 | 1 | -1/+1 |
| | | | | | |||||
| | | * | | Accept DatetimeInterface in fromDatetime | Bo Yang | 2017-12-14 | 2 | -12/+14 |
| | | | | | |||||
| | | * | | Avoid using php_date_get_date_ce() in case date extension is not | Bo Yang | 2017-12-13 | 1 | -2/+15 |
| | | | | | | | | | | | | | | | | | | | | available. | ||||
| | | * | | Call php method via function name instead of calling directly. | Bo Yang | 2017-12-12 | 4 | -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_get | Bo Yang | 2017-12-12 | 2 | -5/+31 |
| | | | | | |||||
| | | * | | Add PROTOBUF_ENABLE_TIMESTAMP to let user decide whether timestamp util | Bo Yang | 2017-12-12 | 2 | -2/+13 |
| | | | | | | | | | | | | | | | | | | | | can be used at install time. | ||||
| | * | | | Merge pull request #4040 from bazurbat/3.5.x | Adam Cozzette | 2017-12-15 | 1 | -0/+1 |
| | |\ \ \ | | | | | | | | | | | | | Create containing directory before generating well_known_types_embed.cc | ||||
| | | * | | | Create containing directory before generating well_known_types_embed.cc | Oleg Kolosov | 2017-12-13 | 1 | -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/py26 | Jisi Liu | 2017-12-14 | 1 | -1/+0 |
| | |\ \ \ | | | | | | | | | | | | | Remove py2.6 support. | ||||
| | | * | | | Remove py2.6 support. | Jisi Liu | 2017-12-14 | 1 | -1/+0 |
| | | | | | | |||||
| | * | | | | Merge pull request #4042 from pherl/cpp_enum | Jisi Liu | 2017-12-13 | 1 | -9/+9 |
| | |\ \ \ \ | | | | | | | | | | | | | | | Use matching enum type for IsPOD. | ||||
| | | * | | | | Use matching enum type for IsPOD. | Jisi Liu | 2017-12-13 | 1 | -9/+9 |
| | | | | | | | |||||
| | * | | | | | Merge pull request #4043 from pherl/flush | Jisi Liu | 2017-12-13 | 1 | -2/+2 |
| | |\ \ \ \ \ | | | |_|/ / / | | |/| | | | | Explicitly propagate the status of Flush(). | ||||
| | | * | | | | Explicitly propagate the status of Flush(). | Jisi Liu | 2017-12-13 | 1 | -2/+2 |
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before the change, an implicit Flush() will be triggered in the destructor of the input stream. However, the return code of Flush() is not discarded. This change makes sure when Flush() fails, we will return false. | ||||
| | * | | | | Merge pull request #4028 from TeBoring/3.5.x | Paul Yang | 2017-12-12 | 1 | -1/+1 |
| | |\ \ \ \ | | | |_|/ / | | |/| | | | Add backslach to make class explict in global namespace |