Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix bugs | Yilun Chong | 2017-12-13 | 7 | -157/+81 |
* | Add caliper supported to java benchmark | Yilun Chong | 2017-12-12 | 9 | -335/+554 |
* | Merge pull request #3988 from acozzette/down-integrate | Adam Cozzette | 2017-12-05 | 142 | -3270/+4456 |
|\ | |||||
| * | Fixed failing JS tests | Adam Cozzette | 2017-12-05 | 4 | -11/+3 |
| * | Updated conformance failure lists | Adam Cozzette | 2017-12-04 | 3 | -9/+0 |
| * | Updated Makefile.am to add a new file to EXTRA_DIST | Adam Cozzette | 2017-12-01 | 1 | -0/+1 |
| * | Merge branch 'master' into down-integrate | Adam Cozzette | 2017-12-01 | 135 | -5818/+2910 |
| |\ | |||||
| * | | Integrated internal changes from Google | Adam Cozzette | 2017-12-01 | 143 | -3272/+4483 |
* | | | Merge pull request #3926 from BSBandme/down_sync_benchmark | Yilun Chong | 2017-12-05 | 29 | -464/+8661 |
|\ \ \ | |||||
| * | | | Fix bugs to pass tests | Yilun Chong | 2017-12-04 | 2 | -8/+13 |
| * | | | Sync internal benchmark changes | Yilun Chong | 2017-12-01 | 28 | -459/+8651 |
| | |/ | |/| | |||||
* | | | Merge pull request #3968 from fahhem/patch-2 | Feng Xiao | 2017-12-04 | 2 | -0/+14 |
|\ \ \ | |||||
| * | | | Add a check_protobuf_required_bazel_version() for use in WORKSPACEs | Fahrzin Hemmati | 2017-12-04 | 2 | -0/+14 |
* | | | | Remove Xcode directives on some configs. | Thomas Van Lenten | 2017-12-04 | 1 | -8/+0 |
| |/ / |/| | | |||||
* | | | Merge pull request #3979 from acozzette/3.5.x-merge | Adam Cozzette | 2017-12-01 | 56 | -252/+291 |
|\ \ \ | |/ / |/| | | |||||
| * | | Merge branch '3.5.x' into 3.5.x-merge | Adam Cozzette | 2017-11-30 | 56 | -252/+291 |
|/| | | |||||
| * | | Remove duplicate typedef. (#3975) | Paul Yang | 2017-11-30 | 1 | -19/+7 |
| * | | Provide discardUnknonwnFields API in php (#3976) | Paul Yang | 2017-11-30 | 5 | -0/+27 |
| * | | Update version for 3.5.0.post1 | Jisi Liu | 2017-11-22 | 1 | -1/+1 |
| * | | Merge pull request #3941 from google/anandolee-patch-2 | Jisi Liu | 2017-11-22 | 1 | -1/+10 |
| |\ \ | |||||
| | * | | Add _file_desc_by_toplevel_extension back | Jie Luo | 2017-11-22 | 1 | -1/+10 |
| |/ / | |||||
| * | | Update version number for php c extension (#3896) | Paul Yang | 2017-11-15 | 2 | -4/+20 |
| * | | Merge pull request #3895 from pherl/3.5.x | Jisi Liu | 2017-11-15 | 1 | -1/+1 |
| |\ \ | |||||
| | * | | Add protobuf-all in post release | Jisi Liu | 2017-11-15 | 1 | -1/+1 |
| * | | | Use fully qualifed name for DescriptorPool in Any.php to avoid name (#3886) | Paul Yang | 2017-11-15 | 1 | -4/+3 |
| |/ / | |||||
| * | | Update protoc-artfacts | Jisi Liu | 2017-11-13 | 1 | -5/+6 |
| * | | Merge branch '3.5.x' of github.com:google/protobuf into 3.5.x | Jisi Liu | 2017-11-13 | 5 | -9/+67 |
| |\ \ | |||||
| | * \ | Merge pull request #3868 from pherl/3.5.xv3.5.0 | Jisi Liu | 2017-11-13 | 13 | -29/+22 |
| | |\ \ | |||||
| | * | | | All integer types should accept null in json. (#3869) | Paul Yang | 2017-11-13 | 2 | -5/+22 |
| | * | | | Merge pull request #3867 from jtattermusch/update_changelog | Jisi Liu | 2017-11-10 | 1 | -0/+1 |
| | |\ \ \ | |||||
| | | * | | | update changelog | Jan Tattermusch | 2017-11-10 | 1 | -0/+1 |
| | |/ / / | |||||
| | * | | | Merge pull request #3861 from jtattermusch/backport_3858 | Jisi Liu | 2017-11-10 | 2 | -4/+44 |
| | |\ \ \ | |||||
| | | * | | | ParseFrom<T> for array slice is missing | Jan Tattermusch | 2017-11-10 | 1 | -0/+14 |
| | | * | | | check already performed by MergeFrom | Jan Tattermusch | 2017-11-10 | 1 | -5/+0 |
| | | * | | | allow message parsing from an array slice | Jan Tattermusch | 2017-11-10 | 2 | -0/+31 |
| | |/ / / | |||||
| * | / / | Update release date | Jisi Liu | 2017-11-13 | 1 | -3/+3 |
| | |/ / | |/| | | |||||
| * | | | Support win32 long path for cross compiled build | Jisi Liu | 2017-11-10 | 13 | -29/+22 |
| |/ / | |||||
| * | | Fix arm64 name | Jisi Liu | 2017-11-09 | 1 | -2/+2 |
| * | | Supports Arm64 (aarch64) protoc artifacts | Jisi Liu | 2017-11-09 | 2 | -1/+16 |
| * | | Merge pull request #3854 from pherl/3.5.x | Jisi Liu | 2017-11-08 | 4 | -131/+2 |
| |\ \ | |||||
| | * | | Fix Atomic32/AtomicWord on some platforms. | Jisi Liu | 2017-11-08 | 4 | -131/+2 |
| * | | | Provide util funtions to figure out correct php class names. (#3850) | Paul Yang | 2017-11-08 | 2 | -9/+36 |
| |/ / | |||||
| * | | Merge pull request #3835 from pherl/3.5.x | Jisi Liu | 2017-11-08 | 26 | -43/+118 |
| |\ \ | |||||
| | * | | Fix java code example | Jisi Liu | 2017-11-08 | 1 | -2/+2 |
| | * | | Changelog for 3.5.0 | Jisi Liu | 2017-11-08 | 1 | -0/+75 |
| | * | | Update generated descritpors. | Jisi Liu | 2017-11-02 | 12 | -24/+24 |
| | * | | Update version number to 3.5.0 | Jisi Liu | 2017-11-02 | 13 | -19/+19 |
| * | | | Fix php well known type conformance tests (#3828) (#3840) | Paul Yang | 2017-11-04 | 12 | -164/+520 |
| |/ / | |||||
* | | | Merge pull request #3824 from anuraaga/dev_rag | Feng Xiao | 2017-11-30 | 6 | -37/+921 |
|\ \ \ | |||||
| * | | | Add a UTF-8 decoder that uses Unsafe to directly decode a byte buffer. | Anuraag Agrawal | 2017-11-29 | 6 | -37/+921 |