aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAge
* Merge pull request #4856 from xfxyjwf/optionsGravatar Feng Xiao2018-07-03
|\ | | | | Add global extension registry to the repo.
| * Add global extension registry to the repo.Gravatar Feng Xiao2018-07-02
|/
* Add continuous test for ruby 2.3, 2.4 and 2.5 (#4829)Gravatar Paul Yang2018-07-02
| | | | | | | | | | | | * Add continuous test for ruby 2.3, 2.4 and 2.5 * Change ruby 2.5 to 2.5.0 * No need to provide argument to rb_funcall when argc is 0 * Fix tests for ruby 2.5 * Use rescue instead of assert_raise to accept subclass of error
* Merge pull request #3981 from fahhem/patch-3Gravatar Adam Cozzette2018-07-02
|\ | | | | Handle srcs in generated files by cd'ing in and out
* \ Merge pull request #4321 from devwout/ruby_json_omit_repeatedGravatar Joshua Haberman2018-07-02
|\ \ | | | | | | Ruby JSON encoding omits zero-length repeated fields by default.
* \ \ Merge pull request #4299 from hekike/feat/add-commonjs-strict-import-styleGravatar Joshua Haberman2018-07-02
|\ \ \ | | | | | | | | Feat: add import-style=commonjs_strict option to the compiler
* \ \ \ Merge pull request #3847 from FX-HAO/masterGravatar Joshua Haberman2018-07-02
|\ \ \ \ | | | | | | | | | | Google::Protobuf::Struct can access a missing key (#3846)
* \ \ \ \ Merge pull request #4854 from nehaljwani/win-exportsGravatar Adam Cozzette2018-07-02
|\ \ \ \ \ | | | | | | | | | | | | Missing symbol exports for Windows DLL
* \ \ \ \ \ Merge pull request #4847 from depristo/masterGravatar Feng Xiao2018-07-02
|\ \ \ \ \ \ | | | | | | | | | | | | | | Remove write-strings warning from COPTs
* \ \ \ \ \ \ Merge pull request #4853 from jnordberg/patch-1Gravatar Adam Cozzette2018-07-02
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Add wsrpc
| | | * | | | | Set LIBPROTOBUF_EXPORT on GenericTypeHandler<class google::protobuf::Message>Gravatar Nehal J Wani2018-07-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This should fix https://github.com/google/protobuf/issues/4717
| | | * | | | | Set LIBPROTOBUF_EXPORT on GzipOutputStream::OptionsGravatar Adam Cozzette2018-07-01
| |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes issue #2610. This was originally fixed in a101fa52895fc2ad83d8b5d610243531b1608a08 , but got reverted by d36c0c538a545fac5d9db6ba65c525246d4efa95
| | * | | | | Remove unclear comment.Gravatar mdepristo2018-06-30
| | | | | | |
| * | | | | | Add wsrpcGravatar Johan Nordberg2018-06-30
|/ / / / / /
* | | | | | Merge pull request #4846 from ckhardin/mips-big-endianGravatar Feng Xiao2018-06-29
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix to allow a compilation under mips big endian with gcc
* | | | | | | Fix capsule name. (#4836)Gravatar Thomas Colthurst2018-06-29
| | | | | | | | | | | | | | | | | | | | | Internal convert file was broken. Change the capsule to the correct name
| | * | | | | Remove write-strings warning from COPTs.Gravatar depristo2018-06-28
| |/ / / / / |/| | | | | | | | | | | | | | | | | This change reduces the excessive warnings when compiling C++ protobufs like "external/protobuf_archive/python/google/protobuf/pyext/message.cc:2629:1: warning: ISO C++ forbids converting a string constant to 'char*' [-Wwrite-strings]"
| * | | | | Fix to allow a compilation under mips big endian with gccGravatar Charles Hardin2018-06-28
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The __MIPSEL__ is mips little endian, specific and we needed to compile for a big endian mips target that also happened to be a mips64, so replaced the __MIPSEL__ with a __mip__ which should preserve the build on little endian and allow a build for a big endian setup. $ echo | mips64-linux-gcc -E -dM - ... snip snip ... #define __mips__ 1 #define __MIPSEB__ 1 Signed-off-by: Charles Hardin <ckhardin@gmail.com>
* | | | | Add -Og to no-warning-test (#4830)Gravatar Paul Yang2018-06-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add -Og to no-warning-test * Initialize value * Implement PrintFieldName in CompactRepeatedFieldPrinter to prevent Woverloaded-virtual * Update generated code
* | | | | When initializing a message, skip a field if value is nil (#3693)Gravatar Zachary Anker2018-06-26
| | | | |
* | | | | Adds a base class for all explicitly raised TypeErrors (#4255)Gravatar Erik Benoist2018-06-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * This allows for ruby code to catch and handle Protobuf TypeErrors separately from the standard Ruby TypeError * Maintains backwards compatibility by having the new Google::Protobuf::TypeError inherit from the base TypeError. Any code that was catching TypeError should continue to work.
* | | | | Merge pull request #4828 from mmatuszak-google/patch-1Gravatar Adam Cozzette2018-06-26
|\ \ \ \ \ | | | | | | | | | | | | Removed forward declaration of MemBlock class
| * | | | | Removed forward declaration of MemBlock classGravatar Michal Matuszak2018-06-25
|/ / / / / | | | | | | | | | | | | | | | | | | | | Removed forward declaration of MemBlock class. Declaration is in conflict with declaration `::strings::MemBlock`
* | | | | Merge pull request #4827 from acozzette/merge-3-6-xGravatar Adam Cozzette2018-06-25
|\ \ \ \ \ | | | | | | | | | | | | Merge 3.6.x branch into master
* | | | | | Remove protoc conditional properties (#4817)Gravatar Sydney Acksman2018-06-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Remove protoc conditional properties * Fix duplicate brace
* | | | | | Update minimal Python version to 2.7 (#4207)Gravatar Yuchen Xie2018-06-25
| | | | | |
* | | | | | rename duplicate testMessageSetNullFail function (#3669)Gravatar Pat Moroney2018-06-25
| | | | | | | | | | | | | | | | | | | | | | | | the testMessageSetNullFail function was declared twice. So I renamed one to testMessageSetNullFailMap
* | | | | | Merge pull request #4824 from sschuberth/remove-exec-bitGravatar Feng Xiao2018-06-25
|\ \ \ \ \ \ | | | | | | | | | | | | | | Remove the executable bit from several source code files
* \ \ \ \ \ \ Merge pull request #4826 from ↵Gravatar Feng Xiao2018-06-25
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | wittmeie/wittmeie/fix-for-protobuf-generate-output-definitions Fixed protobuf_generate output definition
* | | | | | | | Improved install command. (#4106)Gravatar Vladimir Kovpak2018-06-25
| | | | | | | | | | | | | | | | | | | | | | | | Added `-y` flag to `sudo apt-get` command.
* | | | | | | | Merge pull request #4608 from khuzemap/masterGravatar Feng Xiao2018-06-25
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Add "override" keyword for overridden virtual functions
* \ \ \ \ \ \ \ \ Merge pull request #4172 from OskarKinomoto/masterGravatar Adam Cozzette2018-06-25
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Add guards against bswap_XX redefnitions
| | | | | * | | | | Merge branch '3.6.x' into merge-3-6-xGravatar Adam Cozzette2018-06-25
| |_|_|_|/| | | | | |/| | | | | | | | |
| | | | | * | | | | Build ruby gem on kokoro (#4819)Gravatar Paul Yang2018-06-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Install rake compiler * Add kokoro config to build ruby gem on linux * Rename from linix to linux * Fix prepare_build.sh name * Clean up * Install bundler * Install bundler * Use c99 in order to build gem on mingw-32 on ruby 2.0.0 See https://github.com/rake-compiler/rake-compiler-dock/issues/4 * Move c99 config to extcofig.rb
* | | | | | | | | | global __version__ In setup.py (#4753)Gravatar cclauss2018-06-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change helps both humans and linters to understand the unusual method of instantiating this global variable.
| | | * | | | | | | Fixed protobuf_generate output definition for files relative to the ↵Gravatar Steffen Wittmeier2018-06-25
| |_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | protobuf_generate command
| | | * | | | | | Remove the executable bit from several source code filesGravatar Sebastian Schuberth2018-06-25
| |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | This potentially avoids compiler warnings.
* | | | | | | | Merge pull request #2470 from xuwei-k/patch-1Gravatar Feng Xiao2018-06-22
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | update ScalaPB url
* \ \ \ \ \ \ \ \ Merge pull request #4168 from jin/masterGravatar Feng Xiao2018-06-22
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Use versions module from Skylib for version checking
| | | | | * | | | | Rename build_artifacts.cfg to release.cfg (#4818)Gravatar Paul Yang2018-06-22
| | | | | | | | | |
| | | | | * | | | | Add files to build ruby artifact for mac on kokoro (#4814)Gravatar Paul Yang2018-06-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add files to build ruby artifact for mac on kokoro * Move ruby specific stuff to ruby dir
* | | | | | | | | | Merge pull request #4815 from vervaekejonathan/masterGravatar Adam Cozzette2018-06-22
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Fix parameters declaration
| * | | | | | | | | | Fix parameters declarationGravatar vervaekejonathan2018-06-22
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #4813 from htuch/fix-any-in-mapGravatar Feng Xiao2018-06-21
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | protostream_objectwriter: fix bug when Any is directly embedded in a …
* \ \ \ \ \ \ \ \ \ \ Merge pull request #4812 from htuch/fix-any-caseGravatar Feng Xiao2018-06-21
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | protostream_objectsource: preserve print options across Any.
* | | | | | | | | | | | Add msbuild targets to C# tools for protoc compilers (#4648)Gravatar Sydney Acksman2018-06-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Added props to C# tools * Add targets file to makefile.am
* | | | | | | | | | | | Merge pull request #4811 from htuch/invalid-name-jsonGravatar Feng Xiao2018-06-21
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | json: include field name in InvalidName status messages.
| | * | | | | | | | | | | Added TODO for grouping options.Gravatar Harvey Tuch2018-06-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Harvey Tuch <htuch@google.com>
| | | * | | | | | | | | | protostream_objectwriter: fix bug when Any is directly embedded in a map.Gravatar Harvey Tuch2018-06-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This came up when trying to round-trip the JSON<->proto3 conversion for Envoy's envoy.admin.v2alpha.ConfigDump (https://github.com/envoyproxy/envoy/blob/b903c1dc984593f8e95e0569c1503dc5d85fbe34/api/envoy/admin/v2alpha/config_dump.proto#L29). Validated fix on the Envoy code base and via the provided unit test. Signed-off-by: Harvey Tuch <htuch@google.com>
| | * | | | | | | | | | | protostream_objectsource: preserve print options across Any.Gravatar Harvey Tuch2018-06-21
| | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #4771. Based on the solution included in the issues from @wangjinhua. Validated this works with Envoy's /config_dump JSON rendering. Signed-off-by: Harvey Tuch <htuch@google.com>