Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | protostream_objectwriter: fix bug when Any is directly embedded in a map. | Harvey Tuch | 2018-06-21 | 4 | -2/+21 |
* | Merge pull request #4797 from sankate/master | Feng Xiao | 2018-06-19 | 1 | -1/+1 |
|\ | |||||
| * | Fix typo in the doc | Sankate Sharma | 2018-06-19 | 1 | -1/+1 |
|/ | |||||
* | Add Google::Protobuf::Any.pack convenience class method. (#4719) | igorpeshansky | 2018-06-19 | 2 | -1/+13 |
* | Merge pull request #4792 from google/issuetemplates | Feng Xiao | 2018-06-19 | 3 | -0/+53 |
|\ | |||||
| * | Add github issue templatesissuetemplates | Feng Xiao | 2018-06-19 | 3 | -0/+53 |
|/ | |||||
* | Merge pull request #4306 from oniksan/upadate-thirdparty | Feng Xiao | 2018-06-18 | 1 | -0/+1 |
|\ | |||||
| * | Update third_party.md | Oleg Malyavkin | 2018-02-13 | 1 | -0/+1 |
* | | Merge pull request #4626 from robhancocksed/master | Feng Xiao | 2018-06-18 | 13 | -39/+39 |
|\ \ | |||||
| * | | Declare some generated C++ methods as static #4602 | Robert Hancock | 2018-05-14 | 13 | -39/+39 |
* | | | Merge pull request #2121 from mazurkin/issue-2108 | Feng Xiao | 2018-06-18 | 5 | -22/+44 |
|\ \ \ | |||||
| * | | | [issue-2108] [protoc/java] Excessive copying on buildPartial() | Nickolay Mazurkin | 2016-09-18 | 5 | -22/+44 |
* | | | | proto_writer.h: RenderBytes is an override. Marking it. (#4707) | medinandres | 2018-06-18 | 1 | -1/+1 |
* | | | | Merge pull request #4739 from asimshankar/tf-bytesize | Feng Xiao | 2018-06-18 | 1 | -1/+5 |
|\ \ \ \ | |||||
| * | | | | Graceful failure in SerializeToArray(). | Asim Shankar | 2018-06-07 | 1 | -1/+5 |
* | | | | | Merge pull request #4760 from dslomov/fix-buildfile-references | Feng Xiao | 2018-06-13 | 1 | -2/+2 |
|\ \ \ \ \ | |||||
| * | | | | | Update build file locations. | Dmitry Lomov | 2018-06-13 | 1 | -2/+2 |
|/ / / / / | |||||
* | | | | | Merge pull request #4755 from xfxyjwf/fix_benchmarks_link | Yilun Chong | 2018-06-12 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | Fix incorrect link. | Feng Xiao | 2018-06-11 | 1 | -1/+1 |
* | | | | | | Merge pull request #4748 from cmclean/master | Feng Xiao | 2018-06-12 | 1 | -0/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Make proto_api target visible | Cory McLean | 2018-06-11 | 1 | -0/+1 |
* | | | | | | | Merge pull request #4758 from dslomov/patch-1 | Feng Xiao | 2018-06-12 | 1 | -2/+3 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | |||||
| * | | | | | | Fix typo | Dmitry Lomov | 2018-06-12 | 1 | -1/+1 |
| * | | | | | | Migrate to supported version of http_archive | Dmitry Lomov | 2018-06-12 | 1 | -1/+2 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #2811 from Dunemaster/master | Feng Xiao | 2018-06-11 | 1 | -0/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Mark sun.misc dependency as optional | Vasiliy Kudryavtsev | 2017-03-09 | 1 | -0/+1 |
* | | | | | | | Merge pull request #3901 from wijagels/master | Feng Xiao | 2018-06-11 | 2 | -28/+28 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Stop unused parameter warnings for generated code in RegisteredArenaDtor | William Jagels | 2017-11-16 | 2 | -28/+28 |
* | | | | | | | | import inspect (#3507) | cclauss | 2018-06-11 | 1 | -0/+3 |
| |_|/ / / / / |/| | | | | | | |||||
* | | | | | | | Merge pull request #4725 from ThomasColthurst/patch-2 | Feng Xiao | 2018-06-09 | 1 | -1/+0 |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | |||||
| * | | | | | | Remove cycle in dependency graph | Thomas Colthurst | 2018-06-04 | 1 | -1/+0 |
* | | | | | | | Align Bazel on Windows with CMake's MSVC flags (#4720) | Loo Rong Jie | 2018-06-05 | 1 | -12/+34 |
* | | | | | | | Update code to work for Xcode 10b1 (#4729) | Sergio Campamá | 2018-06-05 | 5 | -10/+9 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #4699 from BSBandme/add_proto2_to_proto3_plugin | Yilun Chong | 2018-06-04 | 7 | -46/+356 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix | Yilun Chong | 2018-06-04 | 3 | -29/+36 |
| * | | | | | | Add proto2 to proto3 util | Yilun Chong | 2018-05-30 | 7 | -46/+349 |
* | | | | | | | Merge pull request #4698 from ThomasColthurst/proto_c_api | Feng Xiao | 2018-06-03 | 6 | -1/+148 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Introduce Proto C API; based on cl/198113115 by amauryfa | Thomas Colthurst | 2018-05-30 | 6 | -1/+148 |
* | | | | | | | | Merge pull request #4714 from dcarp/reference_protobuf_d | Feng Xiao | 2018-06-03 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Add reference to protobuf-d | Dragos Carp | 2018-06-02 | 1 | -0/+1 |
|/ / / / / / / / | |||||
* | | | | | | | | Remove js_embed binary. (#4709) | Feng Xiao | 2018-06-01 | 6 | -161/+226 |
* | | | | | | | | Merge pull request #4710 from jtattermusch/upport_4706 | Adam Cozzette | 2018-06-01 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Require C++11 and pass -std=c++11 | Adam Cozzette | 2018-06-01 | 1 | -2/+2 |
|/ / / / / / / / | |||||
* | | | | | | | | Merge pull request #4703 from acozzette/thread-safety-annotations | Adam Cozzette | 2018-05-31 | 1 | -3/+17 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Added Clang thread-safety annotations in mutex.h | Adam Cozzette | 2018-05-30 | 1 | -3/+17 |
|/ / / / / / / / | |||||
* | | | | | | | | Merge pull request #4676 from acozzette/update-changelog-script | Adam Cozzette | 2018-05-30 | 1 | -3/+2 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Updated generate_changelog.py | Adam Cozzette | 2018-05-24 | 1 | -3/+2 |
* | | | | | | | | | Merge pull request #4643 from acozzette/merge-3-5-x | Adam Cozzette | 2018-05-30 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch '3.5.x' into merge-3-5-x | Adam Cozzette | 2018-05-17 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ | Merge pull request #4572 from jozefizso/fix/4494_compilation_error_c4146 | Feng Xiao | 2018-04-27 | 1 | -2/+2 |
| | |\ \ \ \ \ \ \ \ \ |