Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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. | ||||
| * | | | | Remove accidentally restored deleted files. | Jisi Liu | 2016-05-06 | 6 | -1492/+0 |
| | | | | | |||||
* | | | | | Merge pull request #1494 from pherl/master | Jisi Liu | 2016-05-06 | 5 | -6/+6 |
|\| | | | | | | | | | | | | | | Fix the std::string error introduced in integration. | ||||
| * | | | | Fix using std::shared_ptr | Jisi Liu | 2016-05-05 | 5 | -5/+5 |
| | | | | | |||||
| * | | | | Fix the std::string error introduced in integration. | Jisi Liu | 2016-05-05 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge pull request #1499 from beardedN5rd/master | Feng Xiao | 2016-05-06 | 1 | -1/+4 |
|\ \ \ \ \ | | | | | | | | | | | | | updated README | ||||
| * | | | | | after comment of Feng Xiao changed the entry to g++ | beardedn5rd | 2016-05-06 | 1 | -2/+2 |
| | | | | | | |||||
| * | | | | | updated README | beardedn5rd | 2016-05-06 | 1 | -1/+4 |
| | | | | | | |||||
* | | | | | | Merge pull request #1496 from ozkuran/master | Feng Xiao | 2016-05-06 | 1 | -1/+1 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | Updated README.md | ||||
| * | | | | | Updated README.md | Mahmut Ali ÖZKURAN | 2016-05-06 | 1 | -1/+1 |
|/ / / / / | | | | | | | | | | | Added relative link to cmake guide. | ||||
* | | | | | Merge pull request #1471 from jskeet/any-host | Jon Skeet | 2016-05-06 | 6 | -23/+88 |
|\ \ \ \ \ | |_|/ / / |/| | | | | Allow custom type URL prefixes in Any.Pack | ||||
| * | | | | Allow custom type URL prefixes in Any.Pack | Jon Skeet | 2016-04-29 | 6 | -23/+88 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (And likewise ignore the prefix in unpack.) Fixes issue #1459. | ||||
* | | | | | Merge pull request #1409 from eeight/fix_enum_corruption | Feng Xiao | 2016-05-04 | 3 | -2/+50 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | Fix bug with silent message corruption in LITE_RUNTIME. | ||||
| * | | | | Fix bug with silent message corruption in LITE_RUNTIME. | Petr Prokhorenkov | 2016-04-21 | 3 | -2/+50 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A protobuf message will be corrupted in the following scenario: 1. Use LITE_RUNTIME. 2. Have an optional enum field following some other field. 3. Update protocol by adding new values to the enum. 4. Have an old client parse and serialize a message having enum field set to a value the client does not understand. 5. Field preceeding the enum is now corrupted. The bug is due to the fact that optimized fallthrough in parser code does not update variablle 'tag' when jumping to the parser code for the next field. | ||||
* | | | | | Merge pull request #1482 from nicolasnoble/rake-tweaks-2 | Joshua Haberman | 2016-05-03 | 1 | -0/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | Properly generating well known proto files for the macos build. | ||||
| * | | | | | Properly generating well known proto files for the macos build. | Nicolas "Pixel" Noble | 2016-05-04 | 1 | -0/+1 |
|/ / / / / | |||||
* | | | | | Merge pull request #1464 from google/benchmarks | Joshua Haberman | 2016-05-03 | 9 | -10/+370 |
|\ \ \ \ \ | | | | | | | | | | | | | Added framework for generating/consuming benchmarking data sets. | ||||
| * | | | | | Addressed PR comments. | Josh Haberman | 2016-05-03 | 4 | -55/+9 |
| | | | | | | |||||
| * | | | | | Fixed for pre-C++11 ifstream which does not accept std::string. | Josh Haberman | 2016-04-29 | 1 | -2/+2 |
| | | | | | | |||||
| * | | | | | Read files directly from filesystem since xxd isn't always available. | Josh Haberman | 2016-04-29 | 3 | -17/+15 |
| | | | | | | |||||
| * | | | | | Make the C++ tests build the benchmarking code. | Josh Haberman | 2016-04-29 | 1 | -0/+3 |
| | | | | | | |||||
| * | | | | | Updates for PR comments. | Josh Haberman | 2016-04-29 | 2 | -5/+6 |
| | | | | | | |||||
| * | | | | | Added README describing the directory. | Josh Haberman | 2016-04-27 | 2 | -3/+33 |
| | | | | | | |||||
| * | | | | | Added framework for generating/consuming benchmarking data sets. | Josh Haberman | 2016-04-27 | 7 | -10/+384 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This takes the code that was sitting in benchmarks/ already and makes it easier for language-specific benchmarks to consume. Future PRs will enhance this so that the language-specific benchmarks can report metrics back that will be tracked over time in PerfKit. | ||||
* | | | | | | Merge pull request #1473 from nicolasnoble/rake-tweaks | Joshua Haberman | 2016-05-03 | 3 | -31/+43 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | Few tweaks to the rakefile to permit native gems compilation with the proto files generation. | ||||
| * | | | | | Addressing concerns. | Nicolas "Pixel" Noble | 2016-04-30 | 1 | -1/+9 |
| | | | | | | |||||
| * | | | | | Few tweaks to the rakefile to permit native gems compilation with the proto ↵ | Nicolas "Pixel" Noble | 2016-04-29 | 3 | -32/+36 |
| | | | | | | | | | | | | | | | | | | | | | | | | files generation. | ||||
* | | | | | | Merge pull request #1467 from pherl/master | Jisi Liu | 2016-04-30 | 213 | -3836/+10987 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Merge Google internal changes |