aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Added download_url to be able to upload to pypi.Jisi Liu2016-05-171-0/+1
|
* Merge pull request #1540 from pherl/changelogv3.0.0-beta-3Jisi Liu2016-05-161-2/+8
|\ | | | | Update changes for lite
| * Update changes for liteJisi Liu2016-05-161-2/+8
| |
* | Merge pull request #1533 from pherl/mapcommentJisi Liu2016-05-161-3/+1
|\ \ | | | | | | Remove the comments about iterator validation
| * | Remove the comments about iterator validationJisi Liu2016-05-131-3/+1
|/ / | | | | | | As it may be implementation dependent.
* | Merge pull request #1532 from pherl/changelogJisi Liu2016-05-131-1/+6
|\| | | | | Update changelogs for C++ maps
| * Update changelogs for C++ mapsJisi Liu2016-05-131-1/+6
|/
* Merge pull request #1527 from haberman/changelogJisi Liu2016-05-121-1/+14
|\ | | | | Added release notes for Ruby and JavaScript.
| * Added release notes for Ruby and JavaScript.Josh Haberman2016-05-121-1/+14
|/
* Merge pull request #1520 from pherl/hashmapvs2008Jisi Liu2016-05-121-3/+55
|\ | | | | Bridge vs2008 hashmaps.
| * Bridge vs2008 hashmaps.Jisi Liu2016-05-111-3/+55
| |
* | Merge pull request #1524 from anandolee/masterJisi Liu2016-05-121-1/+5
|\ \ | | | | | | python changes
| * | python changesJie Luo2016-05-111-1/+5
| | |
| * | Merge pull request #1 from google/beta-3Jie Luo2016-05-11862-26667/+104755
| |\ \ | |/ / |/| | Beta 3
* | | Merge pull request #1515 from pherl/changelog-beta3Jisi Liu2016-05-111-0/+104
|\ \ \ | | | | | | | | Initial draft for changelog.
| * | | Update comments for csharp, zero-copy and objc.Jisi Liu2016-05-111-3/+55
| | | |
| * | | Fix typo.Jisi Liu2016-05-111-1/+1
| | | |
| * | | Initial draft for changelog.Jisi Liu2016-05-101-0/+52
| | |/ | |/|
* | | Merge pull request #1512 from pherl/beta-3Jisi Liu2016-05-1112-14/+14
|\ \ \ | | | | | | | | Update version numbers for beta3
| * | | Fix csharp versionJisi Liu2016-05-111-1/+1
| | | |
| * | | Update version numbers for other languagesJisi Liu2016-05-108-10/+10
| | | |
| * | | Update version numbers for beta3Jisi Liu2016-05-103-3/+3
| |/ /
* | | Merge pull request #1514 from pherl/fix_heap_checkJisi Liu2016-05-101-3/+4
|\ \ \ | | | | | | | | Fix the command line interface unittest again
| * | | Fix the command line interface unittest againJisi Liu2016-05-101-3/+4
| |/ / | | | | | | | | | | | | This time move the macro inside namespaces; hopefully will work with the integration script.
* | | Merge pull request #1513 from pherl/fix-build-protocJisi Liu2016-05-101-1/+1
|\ \ \ | |/ / |/| | Fix protoc build artifact script.
| * | Fix protoc build artifact script.Jisi Liu2016-05-101-1/+1
|/ / | | | | | | pbconfig.h has gone. This commit removes the target.
* | Merge pull request #1510 from thomasvl/nonnullv3.0.0-beta-3-pre-1Thomas Van Lenten2016-05-102-65/+90
|\ \ | | | | | | Declare an init and avoid passing NULL to initWithValue:count:
| * | Declare an init and avoid passing NULL to initWithValue:count:Thomas Van Lenten2016-05-102-65/+90
| | | | | | | | | | | | Fixes https://github.com/google/protobuf/issues/1189
* | | Merge pull request #1498 from thomasvl/build_cleanupJoshua Haberman2016-05-093-3/+110
|\ \ \ | |/ / |/| | Build cleanup
| * | Add the missing maintiner-clean entry for benchmarksThomas Van Lenten2016-05-061-0/+3
| | |
| * | Properly express all outputs for the conformance buildThomas Van Lenten2016-05-061-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 Lenten2016-05-061-0/+2
| | |
* | | Merge pull request #1502 from pherl/masterJisi Liu2016-05-066-1492/+0
|\ \ \ | | | | | | | | Remove accidentally restored deleted files.
| * | | Remove accidentally restored deleted files.Jisi Liu2016-05-066-1492/+0
| | | |
* | | | Merge pull request #1494 from pherl/masterJisi Liu2016-05-065-6/+6
|\| | | | | | | | | | | Fix the std::string error introduced in integration.
| * | | Fix using std::shared_ptrJisi Liu2016-05-055-5/+5
| | | |
| * | | Fix the std::string error introduced in integration.Jisi Liu2016-05-051-1/+1
| | | |
* | | | Merge pull request #1499 from beardedN5rd/masterFeng Xiao2016-05-061-1/+4
|\ \ \ \ | | | | | | | | | | updated README
| * | | | after comment of Feng Xiao changed the entry to g++beardedn5rd2016-05-061-2/+2
| | | | |
| * | | | updated READMEbeardedn5rd2016-05-061-1/+4
| | | | |
* | | | | Merge pull request #1496 from ozkuran/masterFeng Xiao2016-05-061-1/+1
|\ \ \ \ \ | |_|_|/ / |/| | | | Updated README.md
| * | | | Updated README.mdMahmut Ali Ă–ZKURAN2016-05-061-1/+1
|/ / / / | | | | | | | | Added relative link to cmake guide.
* | | | Merge pull request #1471 from jskeet/any-hostJon Skeet2016-05-066-23/+88
|\ \ \ \ | |_|/ / |/| | | Allow custom type URL prefixes in Any.Pack
| * | | Allow custom type URL prefixes in Any.PackJon Skeet2016-04-296-23/+88
| | | | | | | | | | | | | | | | | | | | | | | | (And likewise ignore the prefix in unpack.) Fixes issue #1459.
* | | | Merge pull request #1409 from eeight/fix_enum_corruptionFeng Xiao2016-05-043-2/+50
|\ \ \ \ | | | | | | | | | | Fix bug with silent message corruption in LITE_RUNTIME.
| * | | | Fix bug with silent message corruption in LITE_RUNTIME.Petr Prokhorenkov2016-04-213-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-2Joshua Haberman2016-05-031-0/+1
|\ \ \ \ \ | | | | | | | | | | | | Properly generating well known proto files for the macos build.
| * | | | | Properly generating well known proto files for the macos build.Nicolas "Pixel" Noble2016-05-041-0/+1
|/ / / / /
* | | | | Merge pull request #1464 from google/benchmarksJoshua Haberman2016-05-039-10/+370
|\ \ \ \ \ | | | | | | | | | | | | Added framework for generating/consuming benchmarking data sets.
| * | | | | Addressed PR comments.Josh Haberman2016-05-034-55/+9
| | | | | |