Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge branch '3.6.x' into merge-3-6-x | Adam Cozzette | 2018-06-25 |
|\ | |||
* \ | Merge pull request #2811 from Dunemaster/master | Feng Xiao | 2018-06-11 |
|\ \ | | | | | | | Java: Mark sun.misc dependency as optional | ||
| | * | Update version number to 3.6.0 | Jisi Liu | 2018-05-14 |
| | | | |||
* | | | Remove unsafe no-copy String allocation since it's not useful in recent Java ↵ | Anuraag Agrawal | 2018-05-11 |
| |/ |/| | | | | | versions. | ||
* | | Cleanup + documentation for Java Lite runtime. | Feng Xiao | 2018-04-12 |
| | | |||
* | | Merge branch (#4466) | Paul Yang | 2018-04-02 |
| | | | | | | | | | | | | | | | | * 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 |
| | | |||
* | | Integrated internal changes from Google | Adam Cozzette | 2018-03-13 |
| | | |||
* | | Drop java 6 support | David Ostrovsky | 2018-01-25 |
| | | | | | | | | Fixes #4220. | ||
* | | fix typo in FieldMaskTree.java comment | kenji yoshida | 2018-01-22 |
| | | |||
* | | Merge remote-tracking branch 'origin/3.5.x' into master | Jisi Liu | 2018-01-03 |
|\ \ | |||
| * | | Update version number to 3.5.1 | Jisi Liu | 2017-12-19 |
| | | | |||
* | | | Add deprecation annotation for oneof case. | Jisi Liu | 2017-12-13 |
| | | | |||
* | | | Merge branch 'master' into down-integrate | Adam Cozzette | 2017-12-01 |
|\ \ \ | |||
* | | | | Integrated internal changes from Google | Adam Cozzette | 2017-12-01 |
| | | | | |||
| * | | | Merge branch '3.5.x' into 3.5.x-merge | Adam Cozzette | 2017-11-30 |
| |\| | | |||
| * | | | Add a UTF-8 decoder that uses Unsafe to directly decode a byte buffer. | Anuraag Agrawal | 2017-11-29 |
|/ / / | |||
| * / | Update version number to 3.5.0 | Jisi Liu | 2017-11-02 |
|/ / | |||
* | | Add missing files | Jisi Liu | 2017-10-26 |
| | | |||
* | | Merge remote-tracking branch 'origin/3.4.x' into master | Jisi Liu | 2017-10-25 |
|\ \ | |||
| * \ | Merge pull request #3578 from pherl/filedeprecation | Jisi Liu | 2017-10-18 |
| |\ \ | | | | | | | | | Add @Deprecated annotation support for proto file. | ||
* | | | | Merge from google internal | Jisi Liu | 2017-10-18 |
| | | | | |||
* | | | | Merge remote-tracking branch 'origin/3.4.x' into master | Jisi Liu | 2017-10-11 |
|\| | | | |||
| * | | | Bump version for minor release | Jisi Liu | 2017-09-14 |
| | | | | |||
* | | | | Integrated internal changes from Google | Adam Cozzette | 2017-09-14 |
| | | | | |||
| | * | | Add TODO | Jisi Liu | 2017-08-31 |
| | | | | |||
| | * | | Add @Deprecated annotation support for proto file. | Jisi Liu | 2017-08-31 |
| |/ / | |||
* | | | Merge remote-tracking branch 'origin/3.4.x' into mergemaster | Jisi Liu | 2017-08-18 |
|\| | | |||
* | | | PROTBUF-3394 Potential SIGBUS with UnsafeUtil.getLong | alanbur | 2017-08-08 |
| | | | |||
| * | | Remove dependency on guava 20 | Jisi Liu | 2017-07-25 |
| | | | |||
| * | | Merge from master | Jisi Liu | 2017-07-25 |
| | | | |||
| * | | Update version number for 3.4.0 | Jisi Liu | 2017-07-24 |
| | | | |||
| * | | Merge from Google internal for 3.4 release | Jisi Liu | 2017-07-18 |
| | | | |||
* | | | Merge 3.3.x into master | Bo Yang | 2017-07-18 |
|\ \ \ | |/ / |/| | | |||
| * | | Update version number to 3.3.2 | Bo Yang | 2017-06-21 |
| | | | |||
| * | | Revert guava depedency to version 19. | Feng Xiao | 2017-05-12 |
| | | | |||
| * | | Update version number to 3.3.1 | Feng Xiao | 2017-05-08 |
| | | | |||
* | | | Merge remote-tracking branch 'remotes/google/3.3.x' into merge-3.3-to-master | Adam Cozzette | 2017-04-27 |
|\| | | |||
* | | | Allow unknown values for Map put*Value methods just like every other enum ↵ | Anuraag Agrawal | 2017-04-07 |
| | | | | | | | | | | | | mutation method. | ||
* | | | Merge pull request #2937 from anuraaga/dev_rag2 | Adam Cozzette | 2017-04-06 |
|\ \ \ | | | | | | | | | 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 |
| | | | | | | | | | | | | | | | | 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 |
| | | | | | | | | | | | | | | | | | | | | | | | | 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 |
|/ / / | |||
| * | | Update Java version number and dependency. | Feng Xiao | 2017-03-30 |
| | | | |||
| * | | Fix Java build. | Feng Xiao | 2017-03-29 |
| | | | |||
| * | | Down-integrate from google3. | Feng Xiao | 2017-03-29 |
|/ / | |||
* | | Merge pull request #2860 from prehistoric-penguin/master | Feng Xiao | 2017-03-20 |
|\ \ | | | | | | | Remove duplicated copyright statement | ||
| * | | Remove duplicated copyright statement | prehistoric-penguin | 2017-03-16 |
| | | | |||
* | | | Changed scope of Java deps to "test". | Josh Haberman | 2017-03-15 |
|/ / | | | | | | | This is per: https://github.com/google/protobuf/issues/2019 | ||
* | | Merge pull request #2835 from pherl/javaep | Jisi Liu | 2017-03-13 |
|\ \ | | | | | | | Suppress the last unchecked warning. |