aboutsummaryrefslogtreecommitdiffstats
path: root/java/util
Commit message (Collapse)AuthorAgeFilesLines
* Update protobuf version (#6472)Paul Yang2019-08-051-1/+1
|
* Update protobuf version (#6366)Paul Yang2019-07-111-1/+1
|
* Update version to 3.9.0Hao Nguyen2019-06-171-6/+6
|
* Merge branch '3.8.x' into 3.8.x-201905311515Hao Nguyen2019-05-311-1/+1
|\
| * Update protobuf versionHao Nguyen2019-05-211-1/+1
| |
| * Revert "Update protobuf version"Hao Nguyen2019-05-211-1/+1
| | | | | | | | This reverts commit 6d96493b3147a0f253f7eef2447785e19361afe3.
| * Update protobuf versionHao Nguyen2019-05-211-1/+1
| |
| * Update version to 3.8.0Hao Nguyen2019-04-231-1/+1
| |
* | Add dependency to truth in testHao Nguyen2019-05-311-0/+5
| |
* | Down integrate to GitHubHao Nguyen2019-05-304-0/+311
| |
* | Down integrate to GitHubHao Nguyen2019-04-302-21/+32
|/
* Down integrate to GitHubHao Nguyen2019-04-221-5/+5
|
* Merge branch 'master' of https://github.com/protocolbuffers/protobuf into ↵Hao Nguyen2019-04-091-1/+1
|\ | | | | | | sync201904090622
| * Revert accidentally commitHao Nguyen2019-04-051-14/+0
| |
| * Merge branch 'master' of https://github.com/protocolbuffers/protobufHao Nguyen2019-04-051-1/+1
| |\
| | * Merge branch '3.7.x' into merge-3-7-xAdam Cozzette2019-03-261-1/+1
| | |\
| | | * Update version number to 3.7.1 (#5947)Paul Yang2019-03-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | * Update version number to 3.7.1 * Update version number in port_def.inc
| * | | Down integrate to GithubHao Nguyen2019-04-051-0/+14
| |/ /
* / / Down integrate to GithubHao Nguyen2019-04-091-0/+14
|/ /
* | Down integrate to GithubHao Nguyen2019-03-203-11/+17
| |
* | Merge branch '3.7.x'Bo Yang2019-03-043-3/+3
|\|
| * Update version number to 3.7.0 (#5793)Paul Yang2019-02-281-1/+1
| | | | | | | | | | | | | | | | * Update version number to 3.7.0 * Add php/releash.sh to Makefile.am * Make cpp_distcheck exit on fail
| * Update version to 3.7.0rc3Bo Yang2019-02-221-1/+1
| |
| * Update version to 3.7.0 (#5749)Paul Yang2019-02-191-1/+1
| | | | | | | | | | | | * Update version to 3.7.0 * Update version number for java bom
| * Updated version to 3.7.0rc2Adam Cozzette2019-01-301-1/+1
| |
| * Fixed Javadoc errorsAdam Cozzette2019-01-302-2/+2
| |
| * Update version to 3.7.0Hao Nguyen2019-01-241-1/+1
| |
* | delete all duplicate empty blanks (#5758)Xiang Dai2019-02-201-1/+1
|/ | | Signed-off-by: Xiang Dai <764524258@qq.com>
* Down-integrate internal changes to github.Bo Yang2018-12-207-65/+145
|
* Down-integrate internal changes (#5467)Paul Yang2018-12-141-0/+5
| | | | | | | | * Down-integrate internal changes * Update generated code for php, objc and csharp. * Add missing dependency in conformance_php
* Make sure to add a new line at the end of XML filesHao Nguyen2018-12-141-1/+1
|
* Replace update_version shell script with a python script, which is much ↵Hao Nguyen2018-12-141-8/+6
| | | | better at handling XML rewrite. Update the PHP version too. As part of rewrite, some XML file format will change a little, but the semantics is still the same so it should be okay.
* Merge pull request #5332 from acozzette/integrateAdam Cozzette2018-11-126-29/+280
|\ | | | | Integrated internal changes from Google
| * Integrated internal changes from GoogleAdam Cozzette2018-11-096-29/+280
| |
* | java: add BOM (#5117)Elliotte Rusty Harold2018-11-121-1/+0
|/
* Down-integrate from google3.Josh Haberman2018-09-042-30/+24
|
* Merge master branch.Feng Xiao2018-08-084-7/+65
|\
| * Fix typo in FieldMaskTree.java warningAleksej Kazmin2018-08-071-1/+1
| |
| * Merge branch '3.6.x' into merge-3-6-xAdam Cozzette2018-08-011-1/+1
| |\
| | * Updated version numbers to 3.6.1Adam Cozzette2018-07-271-1/+1
| | |
| * | Ignore unknown enum received in json when ignoreUnknownFields flag is set ↵vijay-bhatt2018-07-302-6/+63
| |/ | | | | | | | | (#4825) * Ignore unknown enum received in json when ignoreUnknownFields flag is set.
* / Down-integrate from google3.Feng Xiao2018-08-086-54/+132
|/
* Update version number to 3.6.0Jisi Liu2018-05-141-1/+1
|
* Merge branch (#4466)Paul Yang2018-04-021-1/+1
| | | | | | | | * Fix setup.py for windows build. * Bump version number to 3.5.2 * Cat the test-suite.log on errors for presubits
* fix typo in FieldMaskTree.java commentkenji yoshida2018-01-221-1/+1
|
* Merge remote-tracking branch 'origin/3.5.x' into masterJisi Liu2018-01-031-1/+1
|\
| * Update version number to 3.5.1Jisi Liu2017-12-191-1/+1
| |
* | Merge branch 'master' into down-integrateAdam Cozzette2017-12-011-1/+1
|\|
| * Update version number to 3.5.0Jisi Liu2017-11-021-1/+1
| |
* | Integrated internal changes from GoogleAdam Cozzette2017-12-013-13/+70
|/