aboutsummaryrefslogtreecommitdiffhomepage
path: root/java/util
Commit message (Expand)AuthorAge
* Update version number to 3.6.0Gravatar Jisi Liu2018-05-14
* Merge branch (#4466)Gravatar Paul Yang2018-04-02
* fix typo in FieldMaskTree.java commentGravatar kenji yoshida2018-01-22
* Merge remote-tracking branch 'origin/3.5.x' into masterGravatar Jisi Liu2018-01-03
|\
| * Update version number to 3.5.1Gravatar Jisi Liu2017-12-19
* | Merge branch 'master' into down-integrateGravatar Adam Cozzette2017-12-01
|\|
* | Integrated internal changes from GoogleGravatar Adam Cozzette2017-12-01
| * Update version number to 3.5.0Gravatar Jisi Liu2017-11-02
|/
* Merge from google internalGravatar Jisi Liu2017-10-18
* Merge remote-tracking branch 'origin/3.4.x' into masterGravatar Jisi Liu2017-10-11
|\
| * Bump version for minor releaseGravatar Jisi Liu2017-09-14
* | Integrated internal changes from GoogleGravatar Adam Cozzette2017-09-14
|/
* Remove dependency on guava 20Gravatar Jisi Liu2017-07-25
* Update version number for 3.4.0Gravatar Jisi Liu2017-07-24
* Merge from Google internal for 3.4 releaseGravatar Jisi Liu2017-07-18
* Merge remote-tracking branch 'remotes/google/3.3.x' into merge-3.3-to-masterGravatar Adam Cozzette2017-04-27
|\
* | Allow unknown values for Map put*Value methods just like every other enum mut...Gravatar Anuraag Agrawal2017-04-07
* | Merge pull request #2937 from anuraaga/dev_rag2Gravatar Adam Cozzette2017-04-06
|\ \
| * | Fix test for unexpected type url when parsing Any. Currently, the test fails ...Gravatar Anuraag Agrawal2017-04-05
| * | Fix duplicate fields test. The repeated version is passing because null value...Gravatar Anuraag Agrawal2017-04-04
* | | Fix error message for int64 parse error.Gravatar Anuraag Agrawal2017-04-03
|/ /
| * Update Java version number and dependency.Gravatar Feng Xiao2017-03-30
| * Fix Java build.Gravatar Feng Xiao2017-03-29
| * Down-integrate from google3.Gravatar Feng Xiao2017-03-29
|/
* Remove duplicated copyright statementGravatar prehistoric-penguin2017-03-16
* Merge pull request #2818 from xfxyjwf/i1470Gravatar Feng Xiao2017-03-10
|\
| * Don't expose gson exceptions in JsonFormat.Gravatar Feng Xiao2017-03-09
* | Make JsonFormat locale independent.Gravatar Feng Xiao2017-03-08
|/
* Merge 3.2.x branch into master (#2648)Gravatar Paul Yang2017-01-31
* Merge pull request #2394 from cwelton/formattingGravatar Feng Xiao2016-12-08
|\
| * oneOf fix for JsonFormat includingDefaultValueFieldsGravatar Caleb Welton2016-12-05
* | Merge branch 'master' into down-integrate-with-msvc-fixGravatar Adam Cozzette2016-11-17
|\|
* | Integrated internal changes from GoogleGravatar Adam Cozzette2016-11-17
| * Use latest maven-compiler-plugin (2.6.0)Gravatar Christopher Tubbs2016-11-04
|/
* Update version number.Gravatar Bo Yang2016-10-10
* Bump version number to 3.1.0-alpha-1.Gravatar Bo Yang2016-10-10
* Integrate internal changesGravatar Bo Yang2016-10-10
* Fix gson dependency.Gravatar Bo Yang2016-09-21
* Merge remote-tracking branch 'origin/3.0.x' into mergeGravatar Jisi Liu2016-09-14
|\
* | Allow the JsonFormat.Parser to ignore unknown fieldsGravatar Dave Protasowski2016-09-08
| * Bump version number to 3.0.2Gravatar Jisi Liu2016-09-02
|/
* Bump version number for GAGravatar Jisi Liu2016-07-25
* Update version number to 3.0.0-beta-4Gravatar Feng Xiao2016-07-13
* Integrate from internal code base.Gravatar Feng Xiao2016-07-13
* added minified JSON formatting functionality with testGravatar chezRong2016-07-01
* Integrated internal changes from GoogleGravatar Adam Cozzette2016-06-29
* Update version numbers for other languagesGravatar Jisi Liu2016-05-10
* Down integrate from Google internal.Gravatar Jisi Liu2016-04-28
* Merge branch 'master' of github.com:google/protobufGravatar Jisi Liu2016-03-30
|\
* | Integrate google internal changes.Gravatar Jisi Liu2016-03-30