aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | Merge pull request #4755 from xfxyjwf/fix_benchmarks_linkYilun Chong2018-06-121-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix incorrect link.Feng Xiao2018-06-111-1/+1
* | | | | | | | | | | Merge pull request #4748 from cmclean/masterFeng Xiao2018-06-121-0/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Make proto_api target visibleCory McLean2018-06-111-0/+1
* | | | | | | | | | | | Merge pull request #4758 from dslomov/patch-1Feng Xiao2018-06-121-2/+3
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Fix typoDmitry Lomov2018-06-121-1/+1
| * | | | | | | | | | | Migrate to supported version of http_archiveDmitry Lomov2018-06-121-1/+2
|/ / / / / / / / / / /
* | | | | | | | | | | Merge pull request #2811 from Dunemaster/masterFeng Xiao2018-06-111-0/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Mark sun.misc dependency as optionalVasiliy Kudryavtsev2017-03-091-0/+1
* | | | | | | | | | | | Merge pull request #3901 from wijagels/masterFeng Xiao2018-06-112-28/+28
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Stop unused parameter warnings for generated code in RegisteredArenaDtorWilliam Jagels2017-11-162-28/+28
* | | | | | | | | | | | | import inspect (#3507)cclauss2018-06-111-0/+3
| |_|/ / / / / / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #4725 from ThomasColthurst/patch-2Feng Xiao2018-06-091-1/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Remove cycle in dependency graphThomas Colthurst2018-06-041-1/+0
* | | | | | | | | | | | Align Bazel on Windows with CMake's MSVC flags (#4720)Loo Rong Jie2018-06-051-12/+34
* | | | | | | | | | | | Update code to work for Xcode 10b1 (#4729)Sergio Campamá2018-06-055-10/+9
|/ / / / / / / / / / /
* | | | | | | | | | | Merge pull request #4699 from BSBandme/add_proto2_to_proto3_pluginYilun Chong2018-06-047-46/+356
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | FixYilun Chong2018-06-043-29/+36
| * | | | | | | | | | | Add proto2 to proto3 utilYilun Chong2018-05-307-46/+349
* | | | | | | | | | | | Merge pull request #4698 from ThomasColthurst/proto_c_apiFeng Xiao2018-06-036-1/+148
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Introduce Proto C API; based on cl/198113115 by amauryfaThomas Colthurst2018-05-306-1/+148
* | | | | | | | | | | | | Merge pull request #4714 from dcarp/reference_protobuf_dFeng Xiao2018-06-031-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Add reference to protobuf-dDragos Carp2018-06-021-0/+1
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Remove js_embed binary. (#4709)Feng Xiao2018-06-016-161/+226
* | | | | | | | | | | | | Merge pull request #4710 from jtattermusch/upport_4706Adam Cozzette2018-06-011-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | 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