aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Bump version number to 3.5.2v3.5.2Bo Yang2018-03-0513-15/+31
|
* Fix setup.py for windows build.Bo Yang2018-03-051-4/+22
|
* Merge pull request #4236 from pherl/3.5.xJisi Liu2018-01-261-1/+1
|\ | | | | Bumping number to fix ruby 2.1 on mac
| * Bumping number to fix ruby 2.1 on macJisi Liu2018-01-261-1/+1
| |
* | Fix more memory leak for php c extension (#4211)Paul Yang2018-01-257-27/+117
|/ | | | | | * Fix more memory leak for php c extension * Fix memory leak for php5.5
* Merge pull request #4185 from pherl/ruby2.5Jisi Liu2018-01-171-2/+2
|\ | | | | Update rake file to build of 2.1.6.
| * Update rake file to build of 2.1.6.Jisi Liu2018-01-171-2/+2
| |
* | Merge pull request #4182 from pherl/ruby2.5Jisi Liu2018-01-172-3/+3
|\| | | | | Support ruby2.5
| * Support ruby2.5Jisi Liu2018-01-172-3/+3
| |
* | Well known types are not initialized properly. (#4139)Paul Yang2018-01-053-30/+68
| | | | | | | | | | | | | | | | | | Previously, within the same load period of protobuf module, well known types are not initialized correctly for the second request. The reason is that well known type are only initialized if a method local static variable is not set. However, that variable is not reset after request ends. Therefore, when the second request comes, the method local static variable is still set (by previous request) and well types are not initialized in this case.
* | Merge pull request #4146 from pherl/fix_protocJisi Liu2018-01-051-1/+1
|\ \ | | | | | | Bump protoc-artifact version for a patch rebuild
| * | Bump protoc-artifact version for a patch rebuildJisi Liu2018-01-051-1/+1
| |/
* | 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 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.
| * | | Use matching enum type for IsPOD.Jisi Liu2017-12-131-9/+9
| | | |
* | | | Merge pull request #4043 from pherl/flushJisi Liu2017-12-131-2/+2
|\ \ \ \ | |_|/ / |/| | | Explicitly propagate the status of Flush().
| * | | Explicitly propagate the status of Flush().Jisi Liu2017-12-131-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.xPaul Yang2017-12-121-1/+1
|\ \ \ | |_|/ |/| | Add backslach to make class explict in global namespace
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-15 17:24:21 +0000