aboutsummaryrefslogtreecommitdiffhomepage
path: root/java/core/src
Commit message (Expand)AuthorAge
* Merge from google internalGravatar Jisi Liu2017-10-18
* Integrated internal changes from GoogleGravatar Adam Cozzette2017-09-14
* Merge remote-tracking branch 'origin/3.4.x' into mergemasterGravatar Jisi Liu2017-08-18
|\
* | PROTBUF-3394 Potential SIGBUS with UnsafeUtil.getLongGravatar alanbur2017-08-08
| * Merge from Google internal for 3.4 releaseGravatar Jisi Liu2017-07-18
* | Merge 3.3.x into masterGravatar Bo Yang2017-07-18
|\ \ | |/ |/|
| * Revert guava depedency to version 19.Gravatar Feng Xiao2017-05-12
* | Merge remote-tracking branch 'remotes/google/3.3.x' into merge-3.3-to-masterGravatar Adam Cozzette2017-04-27
|\|
* | Allow unknown values for Map put*Value methods just like every other enum mut...Gravatar Anuraag Agrawal2017-04-07
| * Fix Java build.Gravatar Feng Xiao2017-03-29
| * Down-integrate from google3.Gravatar Feng Xiao2017-03-29
|/
* Merge pull request #2835 from pherl/javaepGravatar Jisi Liu2017-03-13
|\
| * Suppress the last unchecked warning.Gravatar Jisi Liu2017-03-10
* | Merge pull request #2832 from pherl/javaepGravatar Jisi Liu2017-03-10
|\|
* | Merge pull request #2827 from xfxyjwf/i1251Gravatar Feng Xiao2017-03-10
|\ \
| | * Fix java code according to error prone.Gravatar Jisi Liu2017-03-10
| |/ |/|
| * Update comments for setSizeLimit.Gravatar Feng Xiao2017-03-09
* | Fix GeneratedMessageV3 warnings.Gravatar Jisi Liu2017-03-09
* | Fix lint warnings in the javalite branch.Gravatar Jisi Liu2017-03-09
|/
* Merge pull request #2602 from GreatFruitOmsk/issue-2428Gravatar Feng Xiao2017-03-08
|\
* | Merge 3.2.x branch into master (#2648)Gravatar Paul Yang2017-01-31
| * Update AbstractMessage.javaGravatar goorov2017-01-13
| * Update AbstractMessage.javaGravatar goorov2017-01-12
|/
* Change CodedInputStream#DEFAULT_SIZE_LIMIT from 64MB toGravatar Michael Stack2016-12-01
* Merge branch 'master' into down-integrate-with-msvc-fixGravatar Adam Cozzette2016-11-17
|\
* | Integrated internal changes from GoogleGravatar Adam Cozzette2016-11-17
| * #2356 : fix ExceptionInInitializerError on IBM J9Gravatar Time2016-11-11
| * Hacking ByteBufferWriter to work with GAEGravatar nmittler2016-10-20
|/
* Fix java compatibilty tests.Gravatar Feng Xiao2016-10-10
* Integrate internal changesGravatar Bo Yang2016-10-10
* Fix erroneous comment regarding String.substringGravatar Patrick Strawderman2016-09-16
* Versioning Java GeneratedMessage.Gravatar Feng Xiao2016-07-19
* Include javadoc/source in Java release packages.Gravatar Feng Xiao2016-07-18
* Remove Java deterministic API.Gravatar Feng Xiao2016-07-18
* Fix compatiblity issues.Gravatar Feng Xiao2016-07-14
* Integrate from internal code base.Gravatar Feng Xiao2016-07-13
* Fix spelling in strings and commentsGravatar Otto Kekäläinen2016-07-03
* Integrated internal changes from GoogleGravatar Adam Cozzette2016-06-29
* Merge branch 'master' of github.com:google/protobufGravatar Jisi Liu2016-04-28
|\
* | Down integrate from Google internal.Gravatar Jisi Liu2016-04-28
| * Added serialVersionUID to ExtendableMessage.Gravatar Jakub Kukul2016-04-22
|/
* Integrate google internal changes.Gravatar Jisi Liu2016-03-30
* Remove redundant `the` in comments.Gravatar Dongjoon Hyun2016-02-03
* Restore the license for Internal.javaGravatar Jisi Liu2016-01-29
* Uncomment the test, which was commented out during integrationGravatar Jisi Liu2016-01-29
* Integrate from google internal.Gravatar Jisi Liu2016-01-29
* Undo the Java module change for integration.Gravatar Jisi Liu2016-01-28
* move test file (was in wrong place after rebasing on java module refactor)Gravatar Joshua Humphries2016-01-15
* throw IOException instead of InvalidProtocolBufferException when appropriateGravatar Joshua Humphries2016-01-15
* Restructuring protobuf to multiple modulesGravatar nmittler2016-01-13