aboutsummaryrefslogtreecommitdiff
path: root/java/util
Commit message (Expand)AuthorAgeFilesLines
* 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 (#4...vijay-bhatt2018-07-302-6/+63
| |/
* / 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 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
|/
* Merge from google internalJisi Liu2017-10-182-2/+12
* Merge remote-tracking branch 'origin/3.4.x' into masterJisi Liu2017-10-111-1/+1
|\
| * Bump version for minor releaseJisi Liu2017-09-141-1/+1
* | Integrated internal changes from GoogleAdam Cozzette2017-09-141-1/+2
|/
* Remove dependency on guava 20Jisi Liu2017-07-252-14/+10
* Update version number for 3.4.0Jisi Liu2017-07-241-1/+1
* Merge from Google internal for 3.4 releaseJisi Liu2017-07-185-6/+35
* Merge remote-tracking branch 'remotes/google/3.3.x' into merge-3.3-to-masterAdam Cozzette2017-04-274-90/+227
|\
| * Update Java version number and dependency.Feng Xiao2017-03-301-1/+1
| * Fix Java build.Feng Xiao2017-03-292-3/+4
| * Down-integrate from google3.Feng Xiao2017-03-293-89/+225
* | Allow unknown values for Map put*Value methods just like every other enum mut...Anuraag Agrawal2017-04-071-3/+1
* | Merge pull request #2937 from anuraaga/dev_rag2Adam Cozzette2017-04-061-5/+15
|\ \
| * | Fix test for unexpected type url when parsing Any. Currently, the test fails ...Anuraag Agrawal2017-04-051-1/+1
| * | Fix duplicate fields test. The repeated version is passing because null value...Anuraag Agrawal2017-04-041-4/+14
| |/
* / Fix error message for int64 parse error.Anuraag Agrawal2017-04-031-1/+1
|/
* Remove duplicated copyright statementprehistoric-penguin2017-03-161-30/+0
* Merge pull request #2818 from xfxyjwf/i1470Feng Xiao2017-03-102-3/+52
|\
| * Don't expose gson exceptions in JsonFormat.Feng Xiao2017-03-092-3/+52
* | Make JsonFormat locale independent.Feng Xiao2017-03-082-4/+11
|/
* Merge 3.2.x branch into master (#2648)Paul Yang2017-01-311-1/+1
* Merge pull request #2394 from cwelton/formattingFeng Xiao2016-12-082-6/+30
|\
| * oneOf fix for JsonFormat includingDefaultValueFieldsCaleb Welton2016-12-052-6/+30
* | Merge branch 'master' into down-integrate-with-msvc-fixAdam Cozzette2016-11-171-5/+17
|\|
| * Use latest maven-compiler-plugin (2.6.0)Christopher Tubbs2016-11-041-5/+17
* | Integrated internal changes from GoogleAdam Cozzette2016-11-176-25/+80
|/
* Update version number.Bo Yang2016-10-101-1/+1
* Bump version number to 3.1.0-alpha-1.Bo Yang2016-10-101-1/+1
* Integrate internal changesBo Yang2016-10-106-159/+363
* Fix gson dependency.Bo Yang2016-09-211-1/+1
* Merge remote-tracking branch 'origin/3.0.x' into mergeJisi Liu2016-09-141-1/+1
|\
| * Bump version number to 3.0.2Jisi Liu2016-09-021-1/+1
* | Allow the JsonFormat.Parser to ignore unknown fieldsDave Protasowski2016-09-082-6/+38
|/
* Bump version number for GAJisi Liu2016-07-251-1/+1
* Update version number to 3.0.0-beta-4Feng Xiao2016-07-131-1/+1
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-28 21:12:32 +0000