Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into down-integrate | Adam Cozzette | 2017-12-01 | 8 | -40/+923 |
|\ | |||||
| * | Merge branch '3.5.x' into 3.5.x-merge | Adam Cozzette | 2017-11-30 | 3 | -3/+3 |
| |\ | |||||
| | * | Update version number to 3.5.0 | Jisi Liu | 2017-11-02 | 3 | -3/+3 |
| | | | |||||
| * | | Add a UTF-8 decoder that uses Unsafe to directly decode a byte buffer. | Anuraag Agrawal | 2017-11-29 | 5 | -37/+920 |
| |/ | |||||
* / | Integrated internal changes from Google | Adam Cozzette | 2017-12-01 | 12 | -65/+282 |
|/ | |||||
* | Add missing files | Jisi Liu | 2017-10-26 | 1 | -0/+38 |
| | |||||
* | Merge remote-tracking branch 'origin/3.4.x' into master | Jisi Liu | 2017-10-25 | 1 | -0/+1 |
|\ | |||||
| * | Merge pull request #3578 from pherl/filedeprecation | Jisi Liu | 2017-10-18 | 2 | -0/+39 |
| |\ | | | | | | | Add @Deprecated annotation support for proto file. | ||||
| | * | Add TODO | Jisi Liu | 2017-08-31 | 1 | -0/+3 |
| | | | |||||
| | * | Add @Deprecated annotation support for proto file. | Jisi Liu | 2017-08-31 | 2 | -0/+36 |
| | | | |||||
* | | | Merge from google internal | Jisi Liu | 2017-10-18 | 9 | -48/+91 |
| | | | |||||
* | | | Merge remote-tracking branch 'origin/3.4.x' into master | Jisi Liu | 2017-10-11 | 3 | -3/+3 |
|\| | | |||||
| * | | Bump version for minor release | Jisi Liu | 2017-09-14 | 3 | -3/+3 |
| |/ | |||||
* | | Integrated internal changes from Google | Adam Cozzette | 2017-09-14 | 17 | -510/+1454 |
| | | |||||
* | | Merge remote-tracking branch 'origin/3.4.x' into mergemaster | Jisi Liu | 2017-08-18 | 40 | -577/+1471 |
|\| | |||||
| * | Remove dependency on guava 20 | Jisi Liu | 2017-07-25 | 2 | -14/+10 |
| | | |||||
| * | Merge from master | Jisi Liu | 2017-07-25 | 2 | -12/+1 |
| | | |||||
| * | Update version number for 3.4.0 | Jisi Liu | 2017-07-24 | 3 | -3/+3 |
| | | |||||
| * | Merge from Google internal for 3.4 release | Jisi Liu | 2017-07-18 | 38 | -575/+1471 |
| | | |||||
* | | PROTBUF-3394 Potential SIGBUS with UnsafeUtil.getLong | alanbur | 2017-08-08 | 1 | -1/+1 |
| | | |||||
* | | Merge 3.3.x into master | Bo Yang | 2017-07-18 | 4 | -30/+17 |
|\ \ | |/ |/| | |||||
| * | Update version number to 3.3.2 | Bo Yang | 2017-06-21 | 3 | -3/+3 |
| | | |||||
| * | Revert guava depedency to version 19. | Feng Xiao | 2017-05-12 | 3 | -27/+14 |
| | | |||||
| * | Update version number to 3.3.1 | Feng Xiao | 2017-05-08 | 3 | -3/+3 |
| | | |||||
* | | Merge remote-tracking branch 'remotes/google/3.3.x' into merge-3.3-to-master | Adam Cozzette | 2017-04-27 | 44 | -290/+1044 |
|\| | |||||
| * | Update Java version number and dependency. | Feng Xiao | 2017-03-30 | 3 | -4/+10 |
| | | |||||
| * | Fix Java build. | Feng Xiao | 2017-03-29 | 4 | -4/+11 |
| | | |||||
| * | Down-integrate from google3. | Feng Xiao | 2017-03-29 | 41 | -286/+1027 |
| | | |||||
* | | Allow unknown values for Map put*Value methods just like every other enum ↵ | Anuraag Agrawal | 2017-04-07 | 2 | -19/+8 |
| | | | | | | | | mutation method. | ||||
* | | Merge pull request #2937 from anuraaga/dev_rag2 | Adam Cozzette | 2017-04-06 | 1 | -5/+15 |
|\ \ | | | | | | | Fix duplicate fields test and Any test. The repeated version is passing because nu… | ||||
| * | | Fix test for unexpected type url when parsing Any. Currently, the test fails ↵ | Anuraag Agrawal | 2017-04-05 | 1 | -1/+1 |
| | | | | | | | | | | | | since TestAllTypes doesn't have field '@type', which is the same test as testUnknownFields. | ||||
| * | | Fix duplicate fields test. The repeated version is passing because null ↵ | Anuraag Agrawal | 2017-04-04 | 1 | -4/+14 |
| |/ | | | | | | | | | | | values in a repeated field are rejected and not testing what it wanted to. Also adds a oneof version that verifies the case of oneof fields of different names (currently only same name check seems to be tested). Also fix spelling of a test. | ||||
* / | Fix error message for int64 parse error. | Anuraag Agrawal | 2017-04-03 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #2860 from prehistoric-penguin/master | Feng Xiao | 2017-03-20 | 1 | -30/+0 |
|\ | | | | | Remove duplicated copyright statement | ||||
| * | Remove duplicated copyright statement | prehistoric-penguin | 2017-03-16 | 1 | -30/+0 |
| | | |||||
* | | Changed scope of Java deps to "test". | Josh Haberman | 2017-03-15 | 1 | -0/+3 |
|/ | | | | This is per: https://github.com/google/protobuf/issues/2019 | ||||
* | Merge pull request #2835 from pherl/javaep | Jisi Liu | 2017-03-13 | 1 | -0/+1 |
|\ | | | | | Suppress the last unchecked warning. | ||||
| * | Suppress the last unchecked warning. | Jisi Liu | 2017-03-10 | 1 | -0/+1 |
| | | | | | | | | | | | | Likely to be java language issue. Varargs are considered arrays, thus using generic with varargs will cause unchecked warning about generic array creation. | ||||
* | | Merge pull request #2832 from pherl/javaep | Jisi Liu | 2017-03-10 | 1 | -0/+3 |
|\| | | | | | Fix java code according to error prone. | ||||
| * | Fix java code according to error prone. | Jisi Liu | 2017-03-10 | 1 | -0/+3 |
| | | |||||
* | | Merge pull request #2818 from xfxyjwf/i1470 | Feng Xiao | 2017-03-10 | 2 | -3/+52 |
|\ \ | | | | | | | Don't expose gson exceptions in JsonFormat. | ||||
| * | | Don't expose gson exceptions in JsonFormat. | Feng Xiao | 2017-03-09 | 2 | -3/+52 |
| | | | |||||
* | | | Merge pull request #2827 from xfxyjwf/i1251 | Feng Xiao | 2017-03-10 | 1 | -3/+3 |
|\ \ \ | |_|/ |/| | | Update comments for setSizeLimit. | ||||
| * | | Update comments for setSizeLimit. | Feng Xiao | 2017-03-09 | 1 | -3/+3 |
| |/ | |||||
* | | Merge pull request #2825 from pherl/javawarning | Jisi Liu | 2017-03-09 | 5 | -0/+13 |
|\ \ | | | | | | | Cherry-pick changes from javalite branch to also fix Java warnings in the master branch | ||||
| * | | Fix GeneratedMessageV3 warnings. | Jisi Liu | 2017-03-09 | 1 | -0/+4 |
| | | | |||||
| * | | Fix lint warnings in the javalite branch. | Jisi Liu | 2017-03-09 | 4 | -0/+9 |
| |/ | |||||
* / | Make JsonFormat locale independent. | Feng Xiao | 2017-03-08 | 2 | -4/+11 |
|/ | |||||
* | Merge pull request #2602 from GreatFruitOmsk/issue-2428 | Feng Xiao | 2017-03-08 | 1 | -1/+4 |
|\ | | | | | Method Builder#clone() has been changed to bypass Java 1.6 compiler issue. | ||||
| * | Update AbstractMessage.java | goorov | 2017-01-13 | 1 | -1/+1 |
| | | | | | | Apply review's comments. |