aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Require C++11 and pass -std=c++11Adam Cozzette2018-06-011-2/+2
* Merge pull request #4703 from acozzette/thread-safety-annotationsAdam Cozzette2018-05-311-3/+17
|\
| * Added Clang thread-safety annotations in mutex.hAdam Cozzette2018-05-301-3/+17
|/
* Merge pull request #4676 from acozzette/update-changelog-scriptAdam Cozzette2018-05-301-3/+2
|\
| * Updated generate_changelog.pyAdam Cozzette2018-05-241-3/+2
* | Merge pull request #4643 from acozzette/merge-3-5-xAdam Cozzette2018-05-300-0/+0
|\ \
| * \ Merge branch '3.5.x' into merge-3-5-xAdam Cozzette2018-05-170-0/+0
| |\ \
| | * \ Merge pull request #4572 from jozefizso/fix/4494_compilation_error_c4146Feng Xiao2018-04-271-2/+2
| | |\ \
| | | * | Using binary one's complement to negate an unsigned intJozef Izso2018-04-271-2/+2
| | |/ /
| | * | Merge pull request #4398 from pherl/catlog3.5Jisi Liu2018-03-191-1/+1
| | |\ \
| | | * | Cat the test-suite.log on errors for presubitsJisi Liu2018-03-191-1/+1
| | |/ /
| | * | 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
* | | | Move methods out of class (#4697)Paul Yang2018-05-292-15/+26
* | | | Fix php memory leak test (#4692)Paul Yang2018-05-292-4/+18
* | | | [ObjC] Add ability to introspect list of enum values (#4678)leovitch2018-05-294-14/+119
* | | | Add back GeneratedClassName to public (#4686)Paul Yang2018-05-251-0/+10
* | | | Merge pull request #4677 from xfxyjwf/bazelFeng Xiao2018-05-244-22/+1
|\ \ \ \
| * | | | Remove jruby badge from our README.md.Feng Xiao2018-05-241-1/+1
| * | | | Delete jruby kokoro tests.Feng Xiao2018-05-243-21/+0
* | | | | Merge pull request #4659 from calder/bazel-python-namespace-fixFeng Xiao2018-05-241-0/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Declare 'google' namespace when importing Python protobuf via Bazel.Calder Coalson2018-05-221-0/+1
* | | | | Merge pull request #4674 from xfxyjwf/bazelFeng Xiao2018-05-243-0/+19
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Add kokoro configs for bazel build.Feng Xiao2018-05-243-0/+19
* | | | | Fix array constructor in c extension for compatibility (#4667)Paul Yang2018-05-241-3/+3
* | | | | PHP namespaces for nested messages and enums (#4536)Brent Shaffer2018-05-2477-657/+1477
* | | | | Implement array constructor in php c extension.Bo Yang2018-05-243-85/+173
* | | | | PHP array constructors for protobuf messages (#4530)Brent Shaffer2018-05-2431-161/+1082
|/ / / /
* | | | Merge pull request #4669 from jtattermusch/fix_bazel_build_syntaxFeng Xiao2018-05-241-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | fix syntax error in BUILD fileJan Tattermusch2018-05-241-1/+1
|/ / /
* | | Merge pull request #4663 from TeBoring/ruby-distcheckFeng Xiao2018-05-221-0/+1
|\ \ \
| * | | Add missing ruby/tests/test_ruby_package.protoBo Yang2018-05-221-0/+1
* | | | CMake OSX rpath management (#4620)Mizux2018-05-222-1/+19
* | | | Merge pull request #4660 from BSBandme/fix_kokoro_benchmark_buildYilun Chong2018-05-221-6/+6
|\ \ \ \
| * | | | Fix python benchmark buildYilun Chong2018-05-211-6/+6
* | | | | Merge pull request #3984 from laszlocsomor/wildcardFeng Xiao2018-05-221-1/+13
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Windows: expand wildcard argumentsLaszlo Csomor2018-05-221-1/+13
* | | | | Allows the json marshaller to be passed json marshal options (#4252)Erik Benoist2018-05-223-4/+28
|/ / / /
* | | | Merge pull request #4634 from BSBandme/fix_kokoro_benchmark_buildYilun Chong2018-05-214-36/+27
|\| | |
| * | | Fix java benchmark bug, fix python library_pathYilun Chong2018-05-214-36/+27
* | | | remove PACKAGE_NAME and REPOSITORY_NAME deprecated usage (#4650)Ittai Zeidman2018-05-211-2/+2
* | | | Merge pull request #4644 from acozzette/php-timestampAdam Cozzette2018-05-181-3/+5
|\ \ \ \
| * | | | Updated PHP generated code for timestamp.protoAdam Cozzette2018-05-171-3/+5
| | |/ / | |/| |
* / | | Adopt ruby_package in ruby generated code. (#4627)Paul Yang2018-05-175-3/+31
|/ / /
* | | re-write int128 long division to avoid license impact from stackoverflow refe...NickFengIBM2018-05-171-34/+18
* | | Merge pull request #4619 from ccvca/cmake_protobuf_generate_changesFeng Xiao2018-05-171-8/+12
|\ \ \
| * | | cmake: Fix DEPENDS of add_custom_command in protobuf_generateChristian von Arnim2018-05-151-1/+1
| * | | cmake: Add parameter PROTOC_OUT_DIR to protobuf_generateChristian von Arnim2018-05-141-3/+7
| * | | cmake: Use GENERATE_EXTENSIONS parameter in protobuf_generateChristian von Arnim2018-05-141-4/+4
* | | | Merge pull request #4631 from banshee/fix_4615Adam Cozzette2018-05-161-1/+1
|\ \ \ \