aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAge
* Merge branch 'master' into down-integrateGravatar Adam Cozzette2017-12-01
|\
* | Integrated internal changes from GoogleGravatar Adam Cozzette2017-12-01
| |
| * Merge pull request #3979 from acozzette/3.5.x-mergeGravatar Adam Cozzette2017-12-01
| |\ | | | | | | Merge 3.5.x branch into master
| | * Merge branch '3.5.x' into 3.5.x-mergeGravatar Adam Cozzette2017-11-30
| |/|
| | * Remove duplicate typedef. (#3975)Gravatar Paul Yang2017-11-30
| | |
| | * Provide discardUnknonwnFields API in php (#3976)Gravatar Paul Yang2017-11-30
| | | | | | | | | | | | | | | | | | * Provide discardUnknownFields API in php implementation * Provide discardUnknownFields API in php c extension.
| * | Merge pull request #3824 from anuraaga/dev_ragGravatar Feng Xiao2017-11-30
| |\ \ | | | | | | | | [Java] Add a UTF-8 decoder that uses Unsafe to directly decode a byte buffer.
| * \ \ Merge pull request #3955 from linux-on-ibm-z/masterGravatar Feng Xiao2017-11-30
| |\ \ \ | | | | | | | | | | Adding Release_CompareAndSwap 64-bit variant
| * | | | Update csharp version number (#3958)Gravatar Jie Luo2017-11-29
| | | | |
| * | | | Merge pull request #2519 from ↵Gravatar Joshua Haberman2017-11-29
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | rubynerd-forks/ruby-fix-repeated-message-type-field unwrap descriptor class before comparison of RepeatedField types
| * | | | | Fix JsonTokenizer exception messageGravatar Jon Skeet2017-11-29
| | | | | |
| | | | * | Add a UTF-8 decoder that uses Unsafe to directly decode a byte buffer.Gravatar Anuraag Agrawal2017-11-29
| | |_|/ / | |/| | |
| * | | | Merge pull request #3960 from acozzette/libprotoc-export-fixGravatar Adam Cozzette2017-11-28
| |\ \ \ \ | | | | | | | | | | | | Added back in LIBPROTOC_EXPORT which was removed by mistake
| | * | | | Added back in LIBPROTOC_EXPORT which was removed by mistakeGravatar Adam Cozzette2017-11-28
| |/ / / /
| * | | | Merge pull request #3962 from jleni/fix_dotnetGravatar Adam Cozzette2017-11-28
| |\ \ \ \ | | | | | | | | | | | | Upgrading dotnet to 1.0.4
| | * | | | Upgrading dotnet to 1.0.4Gravatar Juan Leni2017-11-28
| | | | | |
| * | | | | Merge pull request #3416 from xiaoshuang-lu/PROTOBUF-3404Gravatar Jisi Liu2017-11-27
| |\ \ \ \ \ | | |/ / / / | |/| | | | [PROTOBUF-3404] add --with-zlib=PATH to configure.ac script
| | | | * | Adding Release_CompareAndSwap 64-bit variantGravatar Nayana-ibm2017-11-27
| | |_|/ / | |/| | |
| | * | | [PROTOBUF-3404] add --with-zlib=PATH to configure.ac scriptGravatar Xiaoshuang LU2017-11-23
| |/ / /
| | | * Update version for 3.5.0.post1Gravatar Jisi Liu2017-11-22
| | | |
| | | * Merge pull request #3941 from google/anandolee-patch-2Gravatar Jisi Liu2017-11-22
| | | |\ | | | | | | | | | | Add _file_desc_by_toplevel_extension back
| | | | * Add _file_desc_by_toplevel_extension backGravatar Jie Luo2017-11-22
| | | |/ | | | | | | | | | | | | | | | | | | | | Add _file_desc_by_toplevel_extension back for compatibility issue with 3.4.1. _file_desc_by_toplevel_extension is a temporary solution for FieldDescriptor.file. FieldDescriptor.file was added in code gen. However, we need to keep it for some time for compatibility reason (with 3.4.1 only). May try to remove it after 2 years.
| * | | Merge pull request #3919 from jart/less-warningsGravatar Feng Xiao2017-11-21
| |\ \ \ | | | | | | | | | | Remove unhelpful build warnings
| * \ \ \ Merge pull request #3918 from OEP/fix-sdistGravatar Feng Xiao2017-11-21
| |\ \ \ \ | | | | | | | | | | | | Include .cc and .h files in Python source distribution
| | | * | | Remove unhelpful build warningsGravatar Justine Tunney2017-11-17
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -Wno-writable-strings removes 230 "ISO C++11 does not allow conversion from string literal to 'char *'" warnings from TensorFlow test / build output. These happen because pyext/ sources pass string literals to Python C API data structures, e.g. PyGetSetDef, which for some reason were designed to not have the const qualifier.
| | * | | Include .cc and .h files in source distributionGravatar Paul Kilgo2017-11-17
| |/ / /
| * | | Small code reorder to maybe make #3893 happy.Gravatar Thomas Van Lenten2017-11-17
| | | | | | | | | | | | | | | | | | | | Use the ivar for the -open, so hopefully it lines up with the -close in dealloc and isn't seen as an unbalanced "open".
| * | | Travis config cleanups and move ObjC to Xcode 9.1.Gravatar Thomas Van Lenten2017-11-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Stop having travis build the test matrix and make it explicit so extra settings are only on the test that need the, this helps make the travis UI a little cleaner (linux hosted stuff doesn't list an Xcode version), as well as avoid unneeded requirements limiting the travis pool something can run on. Small improvements to objectivec/DevTools/full_mac_build.sh to avoid some repeated scripting and hopefully make things more reliable work with Xcode 9.x. Don't mark the iOS tests as able to fail, hopefully with the new settings they are stable and won't give false signals. Simplify the case for xcode versions and fixup xcode 9.[0-1].
| * | | Add Setter/Getter type verification. (#3880)Gravatar dmaclach2017-11-16
| | | | | | | | | | | | | | | | | | | | | | | | Add runtime asserts (that can be disabled in release) that verify that the types being get/set for messages using the C Api match the type in the descriptor for the field being get/set.
| * | | Fix up warnings from Xcode 9.1 (#3887)Gravatar dmaclach2017-11-16
| | | | | | | | | | | | | | | | Fix up warnings from Xcode 9.1
| | | * Update version number for php c extension (#3896)Gravatar Paul Yang2017-11-15
| | | |
| | | * Merge pull request #3895 from pherl/3.5.xGravatar Jisi Liu2017-11-15
| | | |\ | | | | | | | | | | Add protobuf-all in post release
| | | | * Add protobuf-all in post releaseGravatar Jisi Liu2017-11-15
| | | | |
| | | * | Use fully qualifed name for DescriptorPool in Any.php to avoid name (#3886)Gravatar Paul Yang2017-11-15
| | | |/ | | | | | | | | conflict
| * | | Update README.md: C extension works on PHP 7 (#3888)Gravatar Issac Trotts2017-11-15
| | | | | | | | | | | | Here's the pull request that made it happen: https://github.com/google/protobuf/pull/2951
| * | | Merge pull request #3892 from sergiocampama/32bitGravatar Thomas Van Lenten2017-11-15
| |\ \ \ | | | | | | | | | | Fixes 32bit tests.
| * \ \ \ Merge pull request #3878 from Yangqing/masterGravatar Feng Xiao2017-11-15
| |\ \ \ \ | | | | | | | | | | | | Allow one to omit building libprotoc and protoc binaries
| | | * | | Fixes 32bit tests.Gravatar Sergio Campama2017-11-15
| | | | | |
| * | | | | Merge pull request #3891 from thomasvl/travis_cleanupsGravatar Thomas Van Lenten2017-11-15
| |\ \ \ \ \ | | |_|/ / / | |/| | | | Travis cleanups
| * | | | | Merge pull request #3883 from dmaclach/map_optimizationsGravatar Thomas Van Lenten2017-11-15
| |\ \ \ \ \ | | | | | | | | | | | | | | Reduce size of GPBDictionary by getting rid of class creation methods
| | * | | | | codereview cleanupGravatar Dave MacLachlan2017-11-15
| | | | | | |
| * | | | | | Merge pull request #3884 from dmaclach/unsafeGravatar Thomas Van Lenten2017-11-15
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Simplify getter/setter method implementations
| | * | | | | | code review cleanupGravatar Dave MacLachlan2017-11-15
| | | | | | | |
| * | | | | | | Merge pull request #3882 from dmaclach/removeclass2Gravatar Thomas Van Lenten2017-11-15
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Remove unreferenced 'GPBMessageSignatureProtocol' class.
| | | | | * | | | Remove the allowed_failure for python_cpp as the bug was fixed.Gravatar Thomas Van Lenten2017-11-15
| | | | | | | | |
| | | | | * | | | Remove the ruby tests from travis configs.Gravatar Thomas Van Lenten2017-11-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Looking at tarvis history for master, jruby doesn't look like it has passed in a really long time. The other two tests have been failing for a few weeks. Since travis has limited osx hosts, seems better to just remove things we aren't expecting to pass.
| | | | | * | | | Update some comments about testing.Gravatar Thomas Van Lenten2017-11-15
| | | | | | | | |
| | | | | * | | | Instead of listing and then excluding osx builds, just don't list them.Gravatar Thomas Van Lenten2017-11-15
| | |_|_|/ / / / | |/| | | | | |
| | | * | | | | Simplify getter/setter method implementationsGravatar Dave MacLachlan2017-11-14
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove unnecessary retain/releases for GPBFieldDescriptors when creating implementations with blocks. The descriptors do not need to be memory managed because they are essentially global constructs that are guaranteed to be around the lifetime of the app.
| | | * | | | Reduce size of GPBDictionary by getting rid of class creation methodsGravatar Dave MacLachlan2017-11-14
| | |/ / / / | |/| | | |