aboutsummaryrefslogtreecommitdiff
path: root/java
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #5109 from haberman/integrateJoshua Haberman2018-09-07125-11074/+9520
|\
| * Reverted changes to map_lite_test.proto.Josh Haberman2018-09-071-2/+3
| * Down-integrate from google3.Josh Haberman2018-09-04126-11077/+9522
* | Update README.md with gradle instructions for javaKyle Krueger2018-09-061-1/+13
* | update versionElliotte Harold2018-08-271-2/+2
|/
* Replace repo links.Feng Xiao2018-08-223-4/+4
* Fix failing tests.Feng Xiao2018-08-094-2/+19
* Merge master branch.Feng Xiao2018-08-088-14/+150
|\
| * Fix typo in FieldMaskTree.java warningAleksej Kazmin2018-08-071-1/+1
| * Merge branch '3.6.x' into merge-3-6-xAdam Cozzette2018-08-013-4/+4
| |\
| | * Updated version numbers to 3.6.1Adam Cozzette2018-07-273-4/+4
| * | Ignore unknown enum received in json when ignoreUnknownFields flag is set (#4...vijay-bhatt2018-07-302-6/+63
| * | Store the class object itself (#4927)Jonathan Haber2018-07-232-4/+82
* | | Down-integrate from google3.Feng Xiao2018-08-0845-412/+797
|/ /
* | Merge branch '3.6.x' into merge-3-6-xAdam Cozzette2018-06-253-3/+3
|\|
| * Update version number to 3.6.0Jisi Liu2018-05-143-3/+3
* | Merge pull request #2811 from Dunemaster/masterFeng Xiao2018-06-111-0/+1
|\ \
| * | Mark sun.misc dependency as optionalVasiliy Kudryavtsev2017-03-091-0/+1
* | | Remove unsafe no-copy String allocation since it's not useful in recent Java ...Anuraag Agrawal2018-05-112-35/+2
| |/ |/|
* | Cleanup + documentation for Java Lite runtime.Feng Xiao2018-04-126-271/+111
* | Merge branch (#4466)Paul Yang2018-04-023-3/+3
* | Added map_lite_test.proto to fix LiteTestAdam Cozzette2018-03-202-0/+112
* | Integrated internal changes from GoogleAdam Cozzette2018-03-1327-953/+1173
* | Drop java 6 supportDavid Ostrovsky2018-01-251-2/+2
* | fix typo in FieldMaskTree.java commentkenji yoshida2018-01-221-1/+1
* | Merge remote-tracking branch 'origin/3.5.x' into masterJisi Liu2018-01-033-3/+3
|\ \
| * | Update version number to 3.5.1Jisi Liu2017-12-193-3/+3
* | | Add deprecation annotation for oneof case.Jisi Liu2017-12-131-6/+14
* | | Merge branch 'master' into down-integrateAdam Cozzette2017-12-018-40/+923
|\ \ \
| * | | Merge branch '3.5.x' into 3.5.x-mergeAdam Cozzette2017-11-303-3/+3
| |\| |
| | * | Update version number to 3.5.0Jisi Liu2017-11-023-3/+3
| * | | Add a UTF-8 decoder that uses Unsafe to directly decode a byte buffer.Anuraag Agrawal2017-11-295-37/+920
| |/ /
* / / Integrated internal changes from GoogleAdam Cozzette2017-12-0112-65/+282
|/ /
* | 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
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-27 08:11:53 +0000