aboutsummaryrefslogtreecommitdiff
path: root/java/core
Commit message (Expand)AuthorAgeFilesLines
* Reverted changes to map_lite_test.proto.Josh Haberman2018-09-071-2/+3
* Down-integrate from google3.Josh Haberman2018-09-04124-11047/+9498
* Replace repo links.Feng Xiao2018-08-221-1/+1
* Fix failing tests.Feng Xiao2018-08-094-2/+19
* Merge master branch.Feng Xiao2018-08-083-5/+83
|\
| * 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
| * | Store the class object itself (#4927)Jonathan Haber2018-07-232-4/+82
* | | Down-integrate from google3.Feng Xiao2018-08-0839-358/+665
|/ /
* | Merge branch '3.6.x' into merge-3-6-xAdam Cozzette2018-06-251-1/+1
|\|
| * Update version number to 3.6.0Jisi Liu2018-05-141-1/+1
* | 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
| |/ |/|
* | Merge branch (#4466)Paul Yang2018-04-021-1/+1
* | Added map_lite_test.proto to fix LiteTestAdam Cozzette2018-03-202-0/+112
* | Integrated internal changes from GoogleAdam Cozzette2018-03-1327-953/+1173
* | 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
* | | Add deprecation annotation for oneof case.Jisi Liu2017-12-131-6/+14
* | | Merge branch 'master' into down-integrateAdam Cozzette2017-12-016-38/+921
|\ \ \
| * | | Merge branch '3.5.x' into 3.5.x-mergeAdam Cozzette2017-11-301-1/+1
| |\| |
| | * | Update version number to 3.5.0Jisi Liu2017-11-021-1/+1
| * | | 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-019-52/+212
|/ /
* | 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-187-46/+79
* | | | 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-1416-509/+1452
* | | Merge remote-tracking branch 'origin/3.4.x' into mergemasterJisi Liu2017-08-1833-555/+1424
|\| |
| * | Merge from masterJisi Liu2017-07-251-5/+0
| * | Update version number for 3.4.0Jisi Liu2017-07-241-1/+1
| * | Merge from Google internal for 3.4 releaseJisi Liu2017-07-1833-569/+1436
* | | PROTBUF-3394 Potential SIGBUS with UnsafeUtil.getLongalanbur2017-08-081-1/+1
* | | Merge 3.3.x into masterBo Yang2017-07-182-21/+14
|\ \ \ | |/ / |/| |
| * | Update version number to 3.3.2Bo Yang2017-06-211-1/+1
| * | Revert guava depedency to version 19.Feng Xiao2017-05-122-20/+13
| * | Update version number to 3.3.1Feng Xiao2017-05-081-1/+1
* | | Merge remote-tracking branch 'remotes/google/3.3.x' into merge-3.3-to-masterAdam Cozzette2017-04-2738-198/+808
|\| |
| * | Update Java version number and dependency.Feng Xiao2017-03-301-1/+1
| * | Fix Java build.Feng Xiao2017-03-292-1/+7
| * | Down-integrate from google3.Feng Xiao2017-03-2937-197/+801
* | | Allow unknown values for Map put*Value methods just like every other enum mut...Anuraag Agrawal2017-04-071-16/+7
|/ /
* | 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
|\ \
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-29 04:34:43 +0000