aboutsummaryrefslogtreecommitdiff
path: root/java/core/src
Commit message (Expand)AuthorAgeFilesLines
* Remove unsafe no-copy String allocation since it's not useful in recent Java ...Anuraag Agrawal2018-05-112-35/+2
* Added map_lite_test.proto to fix LiteTestAdam Cozzette2018-03-201-0/+111
* Integrated internal changes from GoogleAdam Cozzette2018-03-1327-953/+1173
* Add deprecation annotation for oneof case.Jisi Liu2017-12-131-6/+14
* Merge branch 'master' into down-integrateAdam Cozzette2017-12-015-37/+920
|\
| * 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 from google internalJisi Liu2017-10-187-46/+79
* Integrated internal changes from GoogleAdam Cozzette2017-09-1416-509/+1452
* Merge remote-tracking branch 'origin/3.4.x' into mergemasterJisi Liu2017-08-1831-553/+1421
|\
| * Merge from Google internal for 3.4 releaseJisi Liu2017-07-1832-568/+1434
* | PROTBUF-3394 Potential SIGBUS with UnsafeUtil.getLongalanbur2017-08-081-1/+1
* | Merge 3.3.x into masterBo Yang2017-07-181-15/+13
|\ \ | |/ |/|
| * Revert guava depedency to version 19.Feng Xiao2017-05-121-15/+13
* | Merge remote-tracking branch 'remotes/google/3.3.x' into merge-3.3-to-masterAdam Cozzette2017-04-2737-197/+802
|\|
| * Fix Java build.Feng Xiao2017-03-291-1/+2
| * 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
|/
* 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 #2827 from xfxyjwf/i1251Feng Xiao2017-03-101-3/+3
|\ \ | |/ |/|
| * Update comments for setSizeLimit.Feng Xiao2017-03-091-3/+3
* | Fix GeneratedMessageV3 warnings.Jisi Liu2017-03-091-0/+4
* | Fix lint warnings in the javalite branch.Jisi Liu2017-03-094-0/+9
|/
* 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
* | Merge 3.2.x branch into master (#2648)Paul Yang2017-01-317-31/+65
|/
* Change CodedInputStream#DEFAULT_SIZE_LIMIT from 64MB toMichael Stack2016-12-012-5/+80
* Merge branch 'master' into down-integrate-with-msvc-fixAdam Cozzette2016-11-172-6/+46
|\
| * #2356 : fix ExceptionInInitializerError on IBM J9Time2016-11-111-1/+1
| * Hacking ByteBufferWriter to work with GAEnmittler2016-10-201-5/+45
* | Integrated internal changes from GoogleAdam Cozzette2016-11-1720-225/+433
|/
* Fix java compatibilty tests.Feng Xiao2016-10-101-350/+1
* Integrate internal changesBo Yang2016-10-1060-1544/+4512
* Fix erroneous comment regarding String.substringPatrick Strawderman2016-09-161-3/+3
* Versioning Java GeneratedMessage.Feng Xiao2016-07-194-347/+2718
* Include javadoc/source in Java release packages.Feng Xiao2016-07-185-16/+16
* Remove Java deterministic API.Feng Xiao2016-07-181-1/+1
* Fix compatiblity issues.Feng Xiao2016-07-141-4/+4
* Integrate from internal code base.Feng Xiao2016-07-134-1/+98
* Fix spelling in strings and commentsOtto Kekäläinen2016-07-033-21/+21
* Integrated internal changes from GoogleAdam Cozzette2016-06-2948-2035/+5516
* Merge branch 'master' of github.com:google/protobufJisi Liu2016-04-281-0/+2
|\
| * Added serialVersionUID to ExtendableMessage.Jakub Kukul2016-04-221-0/+2
* | Down integrate from Google internal.Jisi Liu2016-04-2858-2081/+5886
|/
* Integrate google internal changes.Jisi Liu2016-03-3061-1778/+5280
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-29 08:44:19 +0000