Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge master branch. | Feng Xiao | 2018-08-08 | 8 | -14/+150 |
|\ | |||||
| * | Fix typo in FieldMaskTree.java warning | Aleksej Kazmin | 2018-08-07 | 1 | -1/+1 |
| | | |||||
| * | Merge branch '3.6.x' into merge-3-6-x | Adam Cozzette | 2018-08-01 | 3 | -4/+4 |
| |\ | |||||
| | * | Updated version numbers to 3.6.1 | Adam Cozzette | 2018-07-27 | 3 | -4/+4 |
| | | | |||||
| * | | Ignore unknown enum received in json when ignoreUnknownFields flag is set ↵ | vijay-bhatt | 2018-07-30 | 2 | -6/+63 |
| | | | | | | | | | | | | | | | (#4825) * Ignore unknown enum received in json when ignoreUnknownFields flag is set. | ||||
| * | | 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 | 45 | -412/+797 |
|/ / | |||||
* | | Merge branch '3.6.x' into merge-3-6-x | Adam Cozzette | 2018-06-25 | 3 | -3/+3 |
|\| | |||||
| * | Update version number to 3.6.0 | Jisi Liu | 2018-05-14 | 3 | -3/+3 |
| | | |||||
* | | 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. | ||||
* | | Cleanup + documentation for Java Lite runtime. | Feng Xiao | 2018-04-12 | 6 | -271/+111 |
| | | |||||
* | | Merge branch (#4466) | Paul Yang | 2018-04-02 | 3 | -3/+3 |
| | | | | | | | | | | | | | | | | * 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 |
| | | |||||
* | | Drop java 6 support | David Ostrovsky | 2018-01-25 | 1 | -2/+2 |
| | | | | | | | | Fixes #4220. | ||||
* | | fix typo in FieldMaskTree.java comment | kenji yoshida | 2018-01-22 | 1 | -1/+1 |
| | | |||||
* | | Merge remote-tracking branch 'origin/3.5.x' into master | Jisi Liu | 2018-01-03 | 3 | -3/+3 |
|\ \ | |||||
| * | | Update version number to 3.5.1 | Jisi Liu | 2017-12-19 | 3 | -3/+3 |
| | | | |||||
* | | | 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 | 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. |