Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge master branch. | Feng Xiao | 2018-08-08 | 3 | -5/+83 |
|\ | |||||
| * | Merge branch '3.6.x' into merge-3-6-x | Adam Cozzette | 2018-08-01 | 1 | -1/+1 |
| |\ | |||||
| | * | Updated version numbers to 3.6.1 | Adam Cozzette | 2018-07-27 | 1 | -1/+1 |
| | | | |||||
| * | | Store the class object itself (#4927) | Jonathan Haber | 2018-07-23 | 2 | -4/+82 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Store the class object itself * Add test for backwards compatibility * Rename and add test * Add comments | ||||
* | | | Down-integrate from google3. | Feng Xiao | 2018-08-08 | 39 | -358/+665 |
|/ / | |||||
* | | Merge branch '3.6.x' into merge-3-6-x | Adam Cozzette | 2018-06-25 | 1 | -1/+1 |
|\| | |||||
| * | Update version number to 3.6.0 | Jisi Liu | 2018-05-14 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #2811 from Dunemaster/master | Feng Xiao | 2018-06-11 | 1 | -0/+1 |
|\ \ | | | | | | | Java: Mark sun.misc dependency as optional | ||||
| * | | Mark sun.misc dependency as optional | Vasiliy Kudryavtsev | 2017-03-09 | 1 | -0/+1 |
| | | | |||||
* | | | Remove unsafe no-copy String allocation since it's not useful in recent Java ↵ | Anuraag Agrawal | 2018-05-11 | 2 | -35/+2 |
| |/ |/| | | | | | versions. | ||||
* | | Merge branch (#4466) | Paul Yang | 2018-04-02 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | * Fix setup.py for windows build. * Bump version number to 3.5.2 * Cat the test-suite.log on errors for presubits | ||||
* | | Added map_lite_test.proto to fix LiteTest | Adam Cozzette | 2018-03-20 | 2 | -0/+112 |
| | | |||||
* | | Integrated internal changes from Google | Adam Cozzette | 2018-03-13 | 27 | -953/+1173 |
| | | |||||
* | | Merge remote-tracking branch 'origin/3.5.x' into master | Jisi Liu | 2018-01-03 | 1 | -1/+1 |
|\ \ | |||||
| * | | Update version number to 3.5.1 | Jisi Liu | 2017-12-19 | 1 | -1/+1 |
| | | | |||||
* | | | Add deprecation annotation for oneof case. | Jisi Liu | 2017-12-13 | 1 | -6/+14 |
| | | | |||||
* | | | Merge branch 'master' into down-integrate | Adam Cozzette | 2017-12-01 | 6 | -38/+921 |
|\ \ \ | |||||
| * | | | Merge branch '3.5.x' into 3.5.x-merge | Adam Cozzette | 2017-11-30 | 1 | -1/+1 |
| |\| | | |||||
| | * | | Update version number to 3.5.0 | Jisi Liu | 2017-11-02 | 1 | -1/+1 |
| | | | | |||||
| * | | | 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 | 9 | -52/+212 |
|/ / | |||||
* | | 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 | 7 | -46/+79 |
| | | | | |||||
* | | | | Merge remote-tracking branch 'origin/3.4.x' into master | Jisi Liu | 2017-10-11 | 1 | -1/+1 |
|\| | | | |||||
| * | | | Bump version for minor release | Jisi Liu | 2017-09-14 | 1 | -1/+1 |
| |/ / | |||||
* | | | Integrated internal changes from Google | Adam Cozzette | 2017-09-14 | 16 | -509/+1452 |
| | | | |||||
* | | | Merge remote-tracking branch 'origin/3.4.x' into mergemaster | Jisi Liu | 2017-08-18 | 33 | -555/+1424 |
|\| | | |||||
| * | | Merge from master | Jisi Liu | 2017-07-25 | 1 | -5/+0 |
| | | | |||||
| * | | Update version number for 3.4.0 | Jisi Liu | 2017-07-24 | 1 | -1/+1 |
| | | | |||||
| * | | Merge from Google internal for 3.4 release | Jisi Liu | 2017-07-18 | 33 | -569/+1436 |
| | | | |||||
* | | | 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 | 2 | -21/+14 |
|\ \ \ | |/ / |/| | | |||||
| * | | Update version number to 3.3.2 | Bo Yang | 2017-06-21 | 1 | -1/+1 |
| | | | |||||
| * | | Revert guava depedency to version 19. | Feng Xiao | 2017-05-12 | 2 | -20/+13 |
| | | | |||||
| * | | Update version number to 3.3.1 | Feng Xiao | 2017-05-08 | 1 | -1/+1 |
| | | | |||||
* | | | Merge remote-tracking branch 'remotes/google/3.3.x' into merge-3.3-to-master | Adam Cozzette | 2017-04-27 | 38 | -198/+808 |
|\| | | |||||
| * | | Update Java version number and dependency. | Feng Xiao | 2017-03-30 | 1 | -1/+1 |
| | | | |||||
| * | | Fix Java build. | Feng Xiao | 2017-03-29 | 2 | -1/+7 |
| | | | |||||
| * | | Down-integrate from google3. | Feng Xiao | 2017-03-29 | 37 | -197/+801 |
| | | | |||||
* | | | Allow unknown values for Map put*Value methods just like every other enum ↵ | Anuraag Agrawal | 2017-04-07 | 1 | -16/+7 |
|/ / | | | | | | | mutation method. | ||||
* | | 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 #2827 from xfxyjwf/i1251 | Feng Xiao | 2017-03-10 | 1 | -3/+3 |
|\ \ \ | |/ / |/| | | Update comments for setSizeLimit. |