aboutsummaryrefslogtreecommitdiff
path: root/java
Commit message (Expand)AuthorAgeFilesLines
* Update version number to 3.5.1Jisi Liu2017-12-193-3/+3
* Update version number to 3.5.0Jisi Liu2017-11-023-3/+3
* Add missing filesJisi Liu2017-10-261-0/+38
* Merge remote-tracking branch 'origin/3.4.x' into masterJisi Liu2017-10-251-0/+1
|\
| * Merge pull request #3578 from pherl/filedeprecationJisi Liu2017-10-182-0/+39
| |\
| | * Add TODOJisi Liu2017-08-311-0/+3
| | * Add @Deprecated annotation support for proto file.Jisi Liu2017-08-312-0/+36
* | | Merge from google internalJisi Liu2017-10-189-48/+91
* | | Merge remote-tracking branch 'origin/3.4.x' into masterJisi Liu2017-10-113-3/+3
|\| |
| * | Bump version for minor releaseJisi Liu2017-09-143-3/+3
| |/
* | Integrated internal changes from GoogleAdam Cozzette2017-09-1417-510/+1454
* | Merge remote-tracking branch 'origin/3.4.x' into mergemasterJisi Liu2017-08-1840-577/+1471
|\|
| * Remove dependency on guava 20Jisi Liu2017-07-252-14/+10
| * Merge from masterJisi Liu2017-07-252-12/+1
| * Update version number for 3.4.0Jisi Liu2017-07-243-3/+3
| * Merge from Google internal for 3.4 releaseJisi Liu2017-07-1838-575/+1471
* | PROTBUF-3394 Potential SIGBUS with UnsafeUtil.getLongalanbur2017-08-081-1/+1
* | Merge 3.3.x into masterBo Yang2017-07-184-30/+17
|\ \ | |/ |/|
| * Update version number to 3.3.2Bo Yang2017-06-213-3/+3
| * Revert guava depedency to version 19.Feng Xiao2017-05-123-27/+14
| * Update version number to 3.3.1Feng Xiao2017-05-083-3/+3
* | Merge remote-tracking branch 'remotes/google/3.3.x' into merge-3.3-to-masterAdam Cozzette2017-04-2744-290/+1044
|\|
| * Update Java version number and dependency.Feng Xiao2017-03-303-4/+10
| * Fix Java build.Feng Xiao2017-03-294-4/+11
| * Down-integrate from google3.Feng Xiao2017-03-2941-286/+1027
* | Allow unknown values for Map put*Value methods just like every other enum mut...Anuraag Agrawal2017-04-072-19/+8
* | 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
|/
* Merge pull request #2860 from prehistoric-penguin/masterFeng Xiao2017-03-201-30/+0
|\
| * Remove duplicated copyright statementprehistoric-penguin2017-03-161-30/+0
* | Changed scope of Java deps to "test".Josh Haberman2017-03-151-0/+3
|/
* Merge pull request #2835 from pherl/javaepJisi Liu2017-03-131-0/+1
|\
| * Suppress the last unchecked warning.Jisi Liu2017-03-101-0/+1
* | Merge pull request #2832 from pherl/javaepJisi Liu2017-03-101-0/+3
|\|
| * Fix java code according to error prone.Jisi Liu2017-03-101-0/+3
* | 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
* | | Merge pull request #2827 from xfxyjwf/i1251Feng Xiao2017-03-101-3/+3
|\ \ \ | |_|/ |/| |
| * | Update comments for setSizeLimit.Feng Xiao2017-03-091-3/+3
| |/
* | Merge pull request #2825 from pherl/javawarningJisi Liu2017-03-095-0/+13
|\ \
| * | Fix GeneratedMessageV3 warnings.Jisi Liu2017-03-091-0/+4
| * | Fix lint warnings in the javalite branch.Jisi Liu2017-03-094-0/+9
| |/
* / Make JsonFormat locale independent.Feng Xiao2017-03-082-4/+11
|/
* Merge pull request #2602 from GreatFruitOmsk/issue-2428Feng Xiao2017-03-081-1/+4
|\
| * Update AbstractMessage.javagoorov2017-01-131-1/+1
| * Update AbstractMessage.javagoorov2017-01-121-1/+4
* | Prefer the term "3-Clause BSD License" over "New BSD License"Sebastian Schuberth2017-02-281-1/+1
* | Fix links to the New BSD License in meta-dataSebastian Schuberth2017-02-281-1/+1
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-17 17:32:48 +0000