Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Export class Arena to shared library. | Adam Michalik | 2016-05-17 | 1 | -1/+1 |
| | | | | | This got broken in commit 6ef984af4b0c63c1c33127a12dcfc8e6359f0c9e which integrated changes from internal branch. | ||||
* | Merge pull request #1542 from google/beta-3 | Jisi Liu | 2016-05-16 | 16 | -23/+206 |
|\ | | | | | Merge Beta 3 release branch into master | ||||
| * | Merge pull request #1540 from pherl/changelogv3.0.0-beta-3 | Jisi Liu | 2016-05-16 | 1 | -2/+8 |
| |\ | | | | | | | Update changes for lite | ||||
| | * | Update changes for lite | Jisi Liu | 2016-05-16 | 1 | -2/+8 |
| | | | |||||
| * | | Merge pull request #1533 from pherl/mapcomment | Jisi Liu | 2016-05-16 | 1 | -3/+1 |
| |\ \ | | | | | | | | | Remove the comments about iterator validation | ||||
| | * | | Remove the comments about iterator validation | Jisi Liu | 2016-05-13 | 1 | -3/+1 |
| |/ / | | | | | | | | | | As it may be implementation dependent. | ||||
| * | | Merge pull request #1532 from pherl/changelog | Jisi Liu | 2016-05-13 | 1 | -1/+6 |
| |\| | | | | | | | Update changelogs for C++ maps | ||||
| | * | Update changelogs for C++ maps | Jisi Liu | 2016-05-13 | 1 | -1/+6 |
| |/ | |||||
| * | Merge pull request #1527 from haberman/changelog | Jisi Liu | 2016-05-12 | 1 | -1/+14 |
| |\ | | | | | | | Added release notes for Ruby and JavaScript. | ||||
| | * | Added release notes for Ruby and JavaScript. | Josh Haberman | 2016-05-12 | 1 | -1/+14 |
| |/ | |||||
| * | Merge pull request #1520 from pherl/hashmapvs2008 | Jisi Liu | 2016-05-12 | 1 | -3/+55 |
| |\ | | | | | | | Bridge vs2008 hashmaps. | ||||
| | * | Bridge vs2008 hashmaps. | Jisi Liu | 2016-05-11 | 1 | -3/+55 |
| | | | |||||
| * | | Merge pull request #1524 from anandolee/master | Jisi Liu | 2016-05-12 | 1 | -1/+5 |
| |\ \ | | | | | | | | | python changes | ||||
| | * | | python changes | Jie Luo | 2016-05-11 | 1 | -1/+5 |
| | | | | |||||
| | * | | Merge pull request #1 from google/beta-3 | Jie Luo | 2016-05-11 | 862 | -26667/+104755 |
| | |\ \ | | |/ / | |/| | | Beta 3 | ||||
| * | | | Merge pull request #1515 from pherl/changelog-beta3 | Jisi Liu | 2016-05-11 | 1 | -0/+104 |
| |\ \ \ | | | | | | | | | | | Initial draft for changelog. | ||||
| | * | | | Update comments for csharp, zero-copy and objc. | Jisi Liu | 2016-05-11 | 1 | -3/+55 |
| | | | | | |||||
| | * | | | Fix typo. | Jisi Liu | 2016-05-11 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Initial draft for changelog. | Jisi Liu | 2016-05-10 | 1 | -0/+52 |
| | | |/ | | |/| | |||||
| * | | | Merge pull request #1512 from pherl/beta-3 | Jisi Liu | 2016-05-11 | 12 | -14/+14 |
| |\ \ \ | | | | | | | | | | | Update version numbers for beta3 | ||||
| | * | | | Fix csharp version | Jisi Liu | 2016-05-11 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Update version numbers for other languages | Jisi Liu | 2016-05-10 | 8 | -10/+10 |
| | | | | | |||||
| | * | | | Update version numbers for beta3 | Jisi Liu | 2016-05-10 | 3 | -3/+3 |
| | |/ / | |||||
| * | | | Merge pull request #1514 from pherl/fix_heap_check | Jisi Liu | 2016-05-10 | 1 | -3/+4 |
| |\ \ \ | | | | | | | | | | | Fix the command line interface unittest again | ||||
| | * | | | Fix the command line interface unittest again | Jisi Liu | 2016-05-10 | 1 | -3/+4 |
| | |/ / | | | | | | | | | | | | | | | | | This time move the macro inside namespaces; hopefully will work with the integration script. | ||||
| * | | | Merge pull request #1513 from pherl/fix-build-protoc | Jisi Liu | 2016-05-10 | 1 | -1/+1 |
| |\ \ \ | | |/ / | |/| | | Fix protoc build artifact script. | ||||
| | * | | Fix protoc build artifact script. | Jisi Liu | 2016-05-10 | 1 | -1/+1 |
| |/ / | | | | | | | | | | pbconfig.h has gone. This commit removes the target. | ||||
* | | | Merge pull request #1529 from gkraynov/test-redundant-varint | Joshua Haberman | 2016-05-13 | 1 | -0/+52 |
|\ \ \ | | | | | | | | | Test redundant varint fields decoding in JS. | ||||
| * | | | Test redundant varint fields decoding in JS. | Grigoriy Kraynov | 2016-05-12 | 1 | -0/+52 |
| | | | | | | | | | | | | | | | | | | | | Varints are generally encoded in minimum possible length but need to ensure that any redundancy does not break fields decoder. | ||||
* | | | | Merge pull request #1528 from pherl/master | Jisi Liu | 2016-05-13 | 1 | -4/+1 |
|\ \ \ \ | | | | | | | | | | | Remove the instructions for pbconfig.h | ||||
| * | | | | Remove the instructions for pbconfig.h | Jisi Liu | 2016-05-12 | 1 | -4/+1 |
|/ / / / | |||||
* | | | | Merge pull request #1521 from zhangkun83/master | Jisi Liu | 2016-05-12 | 2 | -5/+23 |
|\ \ \ \ | | | | | | | | | | | Fine-tune build scripts and better documentation. | ||||
| * | | | | Fix the server id in example | Kun Zhang | 2016-05-12 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Fine-tune build scripts and better documentation. | Kun Zhang | 2016-05-11 | 2 | -4/+22 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "make google/protobuf/stubs/pbconfig.h" was added in hope of addressing the issue that when you "make protoc" from a freshly checked out project, pbconfig.h will be reported missing. However, the trick doesn't seem to work. Instead, add instructions in the document to work the issue around. Also document why MSYS2 cannot be used for publishing protoc. | ||||
* | | | | | Merge pull request #1522 from xfxyjwf/compatibility_notice | Jisi Liu | 2016-05-12 | 1 | -30/+55 |
|\ \ \ \ \ | |_|/ / / |/| | | | | Add compatibility notice for Java. | ||||
| * | | | | Add compatibility notice for Java. | Feng Xiao | 2016-05-11 | 1 | -30/+55 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #1518 from jskeet/move_test | Jon Skeet | 2016-05-12 | 3 | -7/+19 |
|\ \ \ \ | |_|/ / |/| | | | Move test for standalone BoolValue to JsonParserTest | ||||
| * | | | Move test for standalone BoolValue to JsonParserTest | Jon Skeet | 2016-05-11 | 3 | -7/+19 |
| | | | | | | | | | | | | | | | | | | | | | | | | Also added a standalone formatter test, for confidence. Have validated that undoing the change in 835fb947 breaks the tests (i.e. we are still testing that the change is required). | ||||
* | | | | Merge pull request #1483 from wal-rus/fix-boost-incompatibility | Feng Xiao | 2016-05-11 | 1 | -3/+1 |
|\ \ \ \ | |/ / / |/| | | | Fix C++ Boost incompatibility on Windows/MSVC | ||||
| * | | | Remove confounding and unused #define - breaks boost/predef/other/endian.h | Walter Gray | 2016-05-06 | 1 | -3/+1 |
| | | | | |||||
* | | | | Merge pull request #1517 from jhickson/boolvalue | Jon Skeet | 2016-05-11 | 2 | -1/+9 |
|\ \ \ \ | |_|/ / |/| | | | Fix C# Json parsing of well-known type Boolvalue | ||||
| * | | | Fixed parsing of BoolValue. | Jos Hickson | 2016-05-11 | 2 | -1/+9 |
| | | | | |||||
| * | | | Merge remote-tracking branch 'refs/remotes/google/master' | Jos Hickson | 2016-05-11 | 566 | -16468/+52048 |
| |\ \ \ | |/ / / |/| | | | |||||
* | | | | Merge pull request #1510 from thomasvl/nonnullv3.0.0-beta-3-pre-1 | Thomas Van Lenten | 2016-05-10 | 2 | -65/+90 |
|\ \ \ \ | | | | | | | | | | | Declare an init and avoid passing NULL to initWithValue:count: | ||||
| * | | | | Declare an init and avoid passing NULL to initWithValue:count: | Thomas Van Lenten | 2016-05-10 | 2 | -65/+90 |
| | | | | | | | | | | | | | | | | | | | | Fixes https://github.com/google/protobuf/issues/1189 | ||||
* | | | | | Merge pull request #1498 from thomasvl/build_cleanup | Joshua Haberman | 2016-05-09 | 3 | -3/+110 |
|\ \ \ \ \ | |/ / / / |/| | | | | Build cleanup | ||||
| * | | | | Add the missing maintiner-clean entry for benchmarks | Thomas Van Lenten | 2016-05-06 | 1 | -0/+3 |
| | | | | | |||||
| * | | | | Properly express all outputs for the conformance build | Thomas Van Lenten | 2016-05-06 | 1 | -3/+105 |
| | | | | | | | | | | | | | | | | | | | | | | | | | - Fixes up `make distclean` and `make maintainer-clean` - Fixes the build so make is more likely to notice if one of those files is stale/missing. | ||||
| * | | | | Add two missing ignores for conformance directory. | Thomas Van Lenten | 2016-05-06 | 1 | -0/+2 |
| | | | | | |||||
* | | | | | Merge pull request #1502 from pherl/master | Jisi Liu | 2016-05-06 | 6 | -1492/+0 |
|\ \ \ \ \ | | | | | | | | | | | | | Remove accidentally restored deleted files. |