aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAge
* 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>
| * | | | | | | Additional whitespace.Gravatar Harvey Tuch2018-06-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Harvey Tuch <htuch@google.com>
| * | | | | | | json: include field name in InvalidName status messages.Gravatar Harvey Tuch2018-06-21
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is invaluable for chasing down the culprit in failed JSON -> proto conversions. We often see in Envoy that a failed JSON (or indirectly via YAML) configuration won't load but it's unclear why. Signed-off-by: Harvey Tuch <htuch@google.com>
* | | | | | | print() is a function in Python 3 (#4754)Gravatar cclauss2018-06-20
| | | | | | |
* | | | | | | Merge pull request #1261 from gjasny/disable-tls-for-osx-10.6Gravatar Adam Cozzette2018-06-20
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Disable thread local storage for OSX < 10.7
* \ \ \ \ \ \ \ Merge pull request #4780 from mwei0210/masterGravatar Adam Cozzette2018-06-20
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | check provided size to check whether to export
* | | | | | | | Merge pull request #4797 from sankate/masterGravatar Feng Xiao2018-06-19
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fix typo in the doc
| * | | | | | | | Fix typo in the docGravatar Sankate Sharma2018-06-19
|/ / / / / / / /
* | | | | | | | Add Google::Protobuf::Any.pack convenience class method. (#4719)Gravatar igorpeshansky2018-06-19
| | | | | | | |
* | | | | | | | Merge pull request #4792 from google/issuetemplatesGravatar Feng Xiao2018-06-19
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Update issue templates
| * | | | | | | | Add github issue templatesGravatar Feng Xiao2018-06-19
|/ / / / / / / /
| | | | | | * | Add "override" for overridden virtual functionsGravatar Khuzema Pithewan2018-06-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add "override" for overridden virtual functions. Please refer following issue for discussion on this. https://github.com/google/protobuf/issues/67
* | | | | | | | Merge pull request #4306 from oniksan/upadate-thirdpartyGravatar Feng Xiao2018-06-18
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Update third_party.md
| | * | | | | | | not emptyGravatar ming2018-06-19
| | | | | | | | |
* | | | | | | | | Merge pull request #4626 from robhancocksed/masterGravatar Feng Xiao2018-06-18
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Declare some generated C++ methods as static #4602
| | | * | | | | | | check provided sizeGravatar ming2018-06-19
| |_|/ / / / / / / |/| | | | | | | |
* | | | | | | | | Merge pull request #2121 from mazurkin/issue-2108Gravatar Feng Xiao2018-06-18
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | issue-2108 [protoc/Java] Excessive copying on buildPartial()
| | | | | | | | | * Added Kokoro protoc release build for OS X (#4770)Gravatar Adam Cozzette2018-06-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This configuration builds both 32-bit and 64-bit binaries for Mac OS X. One thing I had to change was to increase our minimum supported version for 10.7 to 10.9, because 10.9 (Mavericks) appears to be the earliest version supporting C++11.
* | | | | | | | | | proto_writer.h: RenderBytes is an override. Marking it. (#4707)Gravatar medinandres2018-06-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * proto_writer.h: RenderBytes is an override. Marking it.
* | | | | | | | | | Merge pull request #4739 from asimshankar/tf-bytesizeGravatar Feng Xiao2018-06-18
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Graceful failure in SerializeToArray().
| | | | | | | | | | * Work around MSVC issue with std::atomic initialization (#4777)Gravatar Adam Cozzette2018-06-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Work around MSVC issue with std::atomic initialization MSVC seems to have a bug where it does not use constant initialization for std::atomic, which ends up causing crashes during initialization. This change introduces a workaround by putting the std::atomic inside a union, which causes the compiler to use constant initialization for it. * Added an AppVeyor test for static linking with MSVC
| | | | | | | | | | * Added Kokoro Windows release build config for protoc (#4766)Gravatar Adam Cozzette2018-06-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This should make it easy to automatically build 32-bit and 64-bit Windows protoc binaries.
* | | | | | | | | | | Merge pull request #4760 from dslomov/fix-buildfile-referencesGravatar Feng Xiao2018-06-13
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Update build file locations.
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-22 15:22:55 +0000