aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAge
* Merge remote-tracking branch 'refs/remotes/google/master'Gravatar Jos Hickson2016-05-11
|\
| * Merge pull request #1510 from thomasvl/nonnullGravatar Thomas Van Lenten2016-05-10
| |\ | | | | | | Declare an init and avoid passing NULL to initWithValue:count:
| | * Declare an init and avoid passing NULL to initWithValue:count:Gravatar Thomas Van Lenten2016-05-10
| | | | | | | | | | | | Fixes https://github.com/google/protobuf/issues/1189
| * | Merge pull request #1498 from thomasvl/build_cleanupGravatar Joshua Haberman2016-05-09
| |\ \ | | |/ | |/| Build cleanup
| * | Merge pull request #1502 from pherl/masterGravatar Jisi Liu2016-05-06
| |\ \ | | | | | | | | Remove accidentally restored deleted files.
| | * | Remove accidentally restored deleted files.Gravatar Jisi Liu2016-05-06
| | | |
| * | | Merge pull request #1494 from pherl/masterGravatar Jisi Liu2016-05-06
| |\| | | | | | | | | | Fix the std::string error introduced in integration.
| * | | Merge pull request #1499 from beardedN5rd/masterGravatar Feng Xiao2016-05-06
| |\ \ \ | | | | | | | | | | updated README
| | * | | after comment of Feng Xiao changed the entry to g++Gravatar beardedn5rd2016-05-06
| | | | |
| * | | | Merge pull request #1496 from ozkuran/masterGravatar Feng Xiao2016-05-06
| |\ \ \ \ | | | | | | | | | | | | Updated README.md
| | | | | * Add the missing maintiner-clean entry for benchmarksGravatar Thomas Van Lenten2016-05-06
| | | | | |
| | | | | * Properly express all outputs for the conformance buildGravatar Thomas Van Lenten2016-05-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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.Gravatar Thomas Van Lenten2016-05-06
| | |_|_|/ | |/| | |
| | | * | updated READMEGravatar beardedn5rd2016-05-06
| | | | |
| | * | | Updated README.mdGravatar Mahmut Ali ÖZKURAN2016-05-06
| |/ / / | | | | | | | | Added relative link to cmake guide.
| * | | Merge pull request #1471 from jskeet/any-hostGravatar Jon Skeet2016-05-06
| |\ \ \ | | | | | | | | | | Allow custom type URL prefixes in Any.Pack
| | | | * Fix using std::shared_ptrGravatar Jisi Liu2016-05-05
| | | | |
| | | | * Fix the std::string error introduced in integration.Gravatar Jisi Liu2016-05-05
| | |_|/ | |/| |
| * | | Merge pull request #1409 from eeight/fix_enum_corruptionGravatar Feng Xiao2016-05-04
| |\ \ \ | | | | | | | | | | Fix bug with silent message corruption in LITE_RUNTIME.
| * \ \ \ Merge pull request #1482 from nicolasnoble/rake-tweaks-2Gravatar Joshua Haberman2016-05-03
| |\ \ \ \ | | | | | | | | | | | | Properly generating well known proto files for the macos build.
| | * | | | Properly generating well known proto files for the macos build.Gravatar Nicolas "Pixel" Noble2016-05-04
| |/ / / /
| * | | | Merge pull request #1464 from google/benchmarksGravatar Joshua Haberman2016-05-03
| |\ \ \ \ | | | | | | | | | | | | Added framework for generating/consuming benchmarking data sets.
| * \ \ \ \ Merge pull request #1473 from nicolasnoble/rake-tweaksGravatar Joshua Haberman2016-05-03
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | Few tweaks to the rakefile to permit native gems compilation with the proto files generation.
| | | * | | Addressed PR comments.Gravatar Josh Haberman2016-05-03
| | | | | |
| * | | | | Merge pull request #1467 from pherl/masterGravatar Jisi Liu2016-04-30
| |\ \ \ \ \ | | | | | | | | | | | | | | Merge Google internal changes
| | | * | | | Addressing concerns.Gravatar Nicolas "Pixel" Noble2016-04-30
| | | | | | |
| | * | | | | Update descritpor protos for objcGravatar Jisi Liu2016-04-29
| | | | | | |
| * | | | | | Merge pull request #1474 from pherl/fixscriptGravatar Thomas Van Lenten2016-04-29
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix cp -r usage to be portable.
| | | * \ \ \ \ Merge the script fix.Gravatar Jisi Liu2016-04-29
| | | |\ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | * | | | | | Fix cp -r usage to be portable.Gravatar Jisi Liu2016-04-29
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cp -r foo/ bar/ in linux will create a bar/foo directoy. In the objectivec generate descritpor case, well known types will be created in objectivec/google/google/protobuf/.. if the command is run under linux. Adding the trailing period fixes the behavior inconsistency.
| | | * | | | Few tweaks to the rakefile to permit native gems compilation with the proto ↵Gravatar Nicolas "Pixel" Noble2016-04-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | files generation.
| | | | * | | Fixed for pre-C++11 ifstream which does not accept std::string.Gravatar Josh Haberman2016-04-29
| | | | | | |
| | | | * | | Read files directly from filesystem since xxd isn't always available.Gravatar Josh Haberman2016-04-29
| | | | | | |
| | | | * | | Make the C++ tests build the benchmarking code.Gravatar Josh Haberman2016-04-29
| | | | | | |
| | | | * | | Updates for PR comments.Gravatar Josh Haberman2016-04-29
| | | | | | |
| | | | | | * Allow custom type URL prefixes in Any.PackGravatar Jon Skeet2016-04-29
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | (And likewise ignore the prefix in unpack.) Fixes issue #1459.
| | * | | | Update file lists.Gravatar Jisi Liu2016-04-28
| | | | | |
| | * | | | Merge branch 'master' of github.com:google/protobufGravatar Jisi Liu2016-04-28
| | |\ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Down integrate from Google internal.Gravatar Jisi Liu2016-04-28
| | | | | |
| * | | | | Merge pull request #1462 from acozzette/ruby-2.3Gravatar Adam Cozzette2016-04-28
| |\ \ \ \ \ | | |_|/ / / | |/| | | | Added dig and bsearch_index to RepeatedField methods forwarded to array
| | | | * | Added README describing the directory.Gravatar Josh Haberman2016-04-27
| | | | | |
| | | | * | Added framework for generating/consuming benchmarking data sets.Gravatar Josh Haberman2016-04-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 #1461 from thomasvl/fix_bool_handingGravatar Thomas Van Lenten2016-04-27
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | Fix up -hash/-isEqual: for bool storage.
| | * | | | Fix up -hash/-isEqual: for bool storage.Gravatar Thomas Van Lenten2016-04-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Both methods weren't checking the has_bits (where the bools are stored), so it resulted in invalid results. Add a test that should shake out something like this in the future also.
| | | * | | Added dig and bsearch_index to RepeatedField methods forwarded to arrayGravatar Adam Cozzette2016-04-27
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes the test_acts_likes_an_array test in RepeatedFieldTest, which checks that repeated fields respond to the same methods as regular Ruby arrays. The bsearch_index and dig array methods seem to be new in Ruby 2.3 and so we should support those.
| * | | | Merge pull request #1455 from haberman/updateupbGravatar Joshua Haberman2016-04-27
| |\ \ \ \ | | |/ / / | |/| | | Updated upb and simplified ruby code a bit with new upb method.
| * | | | Merge pull request #1454 from thomasvl/enum_defaultsGravatar Thomas Van Lenten2016-04-26
| |\ \ \ \ | | | | | | | | | | | | Proper checking of enum with non zero default
| | * | | | Proper checking of enum with non zero defaultGravatar Thomas Van Lenten2016-04-26
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | proto2 syntax allows the first enum to have a non zero value. This means any field using that default has a non zero default without having an explicit default being set. So when deciding what runtime info is needed, don't rely on an explicit default, always check that the values aren't zero. Fixes https://github.com/google/protobuf/issues/1453
| | * / / Updated upb and simplified ruby code a bit with new upb method.Gravatar Josh Haberman2016-04-22
| |/ / /
| * | | Merge pull request #1444 from mbrtargeting/masterGravatar Feng Xiao2016-04-22
| |\ \ \ | | | | | | | | | | Added serialVersionUID to ExtendableMessage.