aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #3578 from pherl/filedeprecationJisi Liu2017-10-184-2/+45
|\ | | | | Add @Deprecated annotation support for proto file.
| * Add TODOJisi Liu2017-08-311-0/+3
| |
| * Fix dist checkJisi Liu2017-08-311-0/+1
| |
| * Add @Deprecated annotation support for proto file.Jisi Liu2017-08-313-2/+41
| |
* | Merge pull request #3641 from drivehappy/3.4.x_clang_cleanup_3Jisi Liu2017-10-181-1/+1
|\ \ | | | | | | Clang warning cleanup for unused parameter.
| * | Clang warning cleanup for unused parameter.drivehappy2017-09-141-1/+1
| | |
* | | Merge pull request #3690 from pherl/3.4.xJisi Liu2017-10-021-2/+2
|\ \ \ | | | | | | | | Remove ranged based for in io_win32.cc
| * | | Remove ranged based for in io_win32.ccJisi Liu2017-09-271-2/+2
| | | |
* | | | Merge pull request #3691 from pherl/stringbackJisi Liu2017-09-291-1/+1
|\ \ \ \ | |/ / / |/| | | Fix C++11 string accessors
| * | | Add spacesJisi Liu2017-09-271-1/+1
| | | |
| * | | Fix C++11 string accessorsJisi Liu2017-09-271-1/+1
|/ / /
* | | Merge pull request #3651 from pherl/3.4.xJisi Liu2017-09-151-1/+1
|\ \ \ | | | | | | | | Bumping minor version for ruby gems
| * | | Bumping minor version for ruby gemsJisi Liu2017-09-151-1/+1
| | | |
* | | | Merge pull request #3612 from TeBoring/php-bugPaul Yang2017-09-1514-30/+1087
|\ \ \ \ | |/ / / |/| | | Add prefix to php reserved keywords.
| * | | Rename ClassNamePrefix to ConstantNamePrefixBo Yang2017-09-131-4/+3
| | | |
| * | | Exclude valid constant name from reserved name.Bo Yang2017-09-129-238/+652
| | | |
| * | | Change array to map for reserved names in c extensionBo Yang2017-09-113-24/+69
| | | |
| * | | Change array to associate array.Bo Yang2017-09-111-20/+21
| | | |
| * | | Add prefix to php reserved keywords.Bo Yang2017-09-0810-17/+615
| | | |
* | | | Merge pull request #3642 from pherl/3.4.xv3.4.1Jisi Liu2017-09-1413-16/+32
|\ \ \ \ | |_|/ / |/| | | Bump version for minor release
| * | | Bump version for minor releaseJisi Liu2017-09-1413-16/+32
|/ / /
* | | Merge pull request #3634 from TeBoring/ruby-bugPaul Yang2017-09-135-23/+37
|\ \ \ | | | | | | | | Cherry pick bug fix for ruby
| * | | Storing the frame on the map means we don't need the arrayAaron Patterson2017-09-133-14/+9
| | | |
| * | | Move parse frame array to the Map objectAaron Patterson2017-09-135-23/+42
|/ / / | | | | | | | | | This makes the frame stack per-parser, and per-thread. Fixes #3250
* | | Revert "Fix js conformance tests. (#3604)" (#3633)Paul Yang2017-09-136-44/+93
| | | | | | | | | This reverts commit 2bd55a9fbcd2815b3332bf309bc20f59eef0b36b.
* | | Fix js conformance tests. (#3604)Paul Yang2017-09-126-93/+44
|/ / | | | | | | | | | | * Fix js conformance tests. * Remove old incorrect compatibility tests
* | Merge pull request #3596 from jtattermusch/csharp_target_net45Jan Tattermusch2017-09-071-1/+1
|\ \ | | | | | | Google.Protobuf should target net45 (and not net451)
| * | Google.Protobuf should target net45Jan Tattermusch2017-09-051-1/+1
|/ /
* | change the field number of php_generic_service to fix the conflict with (#3576)Paul Yang2017-08-308-151/+216
| | | | | | internal descriptor.proto
* | Merge pull request #3565 from pherl/fixdistJisi Liu2017-08-242-1/+2
|\| | | | | Add mising cmake files in dist
| * Add mising cmake files in distJisi Liu2017-08-242-1/+2
|/
* Merge pull request #3556 from matt-kwong/kokoro_mac_v3Jisi Liu2017-08-231-1/+3
|\ | | | | Remove pre-installed softwares
| * Remove pre-installed softwaresMatt Kwong2017-08-231-1/+3
|/
* Merge pull request #3555 from pherl/fixdistJisi Liu2017-08-232-3/+9
|\ | | | | Make distcheck aware of test proto files.
| * Make distcheck aware of test proto files.Jisi Liu2017-08-232-3/+9
|/
* Merge pull request #3546 from pherl/deathtestJisi Liu2017-08-222-39/+2
|\ | | | | Disable death tests on windows
| * Disable death tests on windowsJisi Liu2017-08-222-39/+2
|/ | | | Also remove cord related code
* Merge pull request #3537 from TeBoring/php-bugJisi Liu2017-08-225-1/+25
|\ | | | | Use message name as defined in php runtime.
| * Use message name as defined in php runtime.Bo Yang2017-08-215-1/+25
| |
* | Merge pull request #3539 from drivehappy/3.4.x_clang_cleanup_1Jisi Liu2017-08-222-29/+33
|\ \ | | | | | | Merge pull request #3535 from drivehappy/clang_warn_cleanup
| * | Merge pull request #3535 from drivehappy/clang_warn_cleanupJisi Liu2017-08-212-29/+33
| | | | | | | | | Fixing unused parameter warnings under Clang.
* | | Merge pull request #3540 from drivehappy/3.4.x_clang_cleanup_2Jisi Liu2017-08-221-2/+5
|\ \ \ | |/ / |/| | Merge pull request #3494 from drivehappy/clang_warning_macro
| * | Merge pull request #3494 from drivehappy/clang_warning_macroJisi Liu2017-08-211-2/+5
|/ / | | | | Fixing -Wexpansion-to-defined Clang warning
* | Merge pull request #3536 from pherl/io32_11Jisi Liu2017-08-211-15/+15
|\ \ | |/ |/| Remove C++11 features in io_win32.cc
| * Fix compile errorsJisi Liu2017-08-211-3/+3
| |
| * Remove C++11 features in io_win32.ccJisi Liu2017-08-211-15/+15
|/ | | | | - Use scoped_array instead of unique_ptr. - Do not use string::front() and string::back()
* Merge pull request #3528 from pherl/rubyfixJisi Liu2017-08-181-1/+1
|\ | | | | Bump gemspec again
| * Bump gemspec againJisi Liu2017-08-181-1/+1
| |
* | Merge pull request #3504 from pherl/3.4.xJisi Liu2017-08-181-0/+3
|\ \ | |/ |/| Prefer system distributed binaries/libraries.
| * Prefer system distributed binaries/libraries.Jisi Liu2017-08-161-0/+3
| | | | | | | | | | | | It seems like the image has a /usr/local/bin/autoconf installed, which doesn't recognize/work with the yum installed libtools. Putting distributed binaries/libraries first solves the problem
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-18 09:04:58 +0000