Commit message (Collapse) | Author | Age | ||
---|---|---|---|---|
... | ||||
* | | | | | | updgrade C# project.json to protobuf 3.2.0 | 2017-03-07 | ||
| | | | | | | ||||
| * | | | | | Merge remote-tracking branch 'upstream/v1.1.x' into 1.1.x_to_master_again | 2017-03-06 | ||
|/| | | | | | ||||
| * | | | | | Merge pull request #9962 from murgatroid99/node_no_alpn_compile | 2017-03-06 | ||
| |\ \ \ \ \ | | | | | | | | | | | | | | | Add option to recompile Node library without ALPN support | |||
| * | | | | | | fix Grpc.HealthCheck and Grpc.Reflection packages | 2017-03-03 | ||
| | | | | | | | ||||
| | * | | | | | Add option to recompile Node library without ALPN support | 2017-03-02 | ||
| |/ / / / / | ||||
* | | | | | | Merge pull request #9769 from ctiller/always-use-port-server | 2017-03-01 | ||
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Always use port server | |||
* | | | | | | | PHP: prepare for 1.2 release | 2017-03-01 | ||
| | | | | | | | ||||
* | | | | | | | Merge pull request #9888 from murgatroid99/electron_uv_fix | 2017-03-01 | ||
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | Fix missing wakeups when using the libuv iomgr under Electron | |||
| | | * | | | | Relieve ios deployment version to 7.0 | 2017-02-28 | ||
| | | | | | | | ||||
| | | | | | * | Merge github.com:grpc/grpc into cpp_bazelness | 2017-02-28 | ||
| | | | | | |\ | |_|_|_|_|_|/ |/| | | | | | | ||||
| | * | | | | | Update template | 2017-02-28 | ||
| |/ / / / / |/| | | | | | ||||
| * | | | | | Fix missing wakeups when using the libuv iomgr under Electron | 2017-02-27 | ||
| |/ / / / | ||||
* | | | | | Merge pull request #9857 from murgatroid99/merge_1.1.x_master | 2017-02-27 | ||
|\ \ \ \ \ | | | | | | | | | | | | | Upmerge 1.1.x into master | |||
| | | | | * | Merge github.com:grpc/grpc into cpp_bazelness | 2017-02-24 | ||
| | | | | |\ | |_|_|_|_|/ |/| | | | | | ||||
* | | | | | | Merge pull request #9747 from ctiller/splitsies | 2017-02-24 | ||
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Increase timeout for bm_fullstack | |||
| | * | | | | | Merge remote-tracking branch 'upstream/v1.1.x' into merge_1.1.x_master | 2017-02-23 | ||
| |/| | | | | |/| |/ / / / | ||||
* | | | | | | Merge pull request #9694 from nicolasnoble/upmerge_from_1_1_x | 2017-02-23 | ||
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Upmerge from 1.1.x | |||
| | | * \ \ \ | Merge pull request #9766 from murgatroid99/node_uv_testing | 2017-02-22 | ||
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | Improve Node and libuv testing and test coverage | |||
| | * | | | | | | Exclude poll, poll-cv for bm_fullstack (its not interesting) | 2017-02-22 | ||
| | | | | | | | | ||||
| | | | | | | * | Start bringing microbenchmarks to Bazel | 2017-02-17 | ||
| |_|_|_|_|_|/ |/| | | | | | | ||||
| | | | * | | | Improve Node and libuv testing and test coverage | 2017-02-17 | ||
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow Node tests to run with or without UV, change default version to 7, add some portability tests. Also make some more core tests work with libuv | |||
| | * | | | | | Increase timeout for bm_fullstack | 2017-02-16 | ||
| |/ / / / / |/| | | | | | ||||
* | | | | | | Merge remote-tracking branch 'upstream/master' into packet-coalescing-core | 2017-02-14 | ||
|\ \ \ \ \ \ | ||||
| | * | | | | | Merge remote-tracking branch 'google/v1.1.x' | 2017-02-13 | ||
| |/| | | | | | | |/ / / / | ||||
| * | | | | | Merge pull request #9665 from jtattermusch/cmake_csharp_extension | 2017-02-10 | ||
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | | Use grpc_csharp_ext built by cmake | |||
| * | | | | | Merge pull request #9599 from ppietrasa/feature-PDBs | 2017-02-10 | ||
| |\ \ \ \ \ | | | | | | | | | | | | | | | Fix issue #9597 | |||
| | | * | | | | use grpc_csharp_ext built by cmake | 2017-02-09 | ||
| | |/ / / / | |/| | | | | ||||
| * | | | | | Advance protoc podspec template version to 3.1.0 as well | 2017-02-09 | ||
| | | | | | | ||||
| | | * | | | build fixes for ruby on mac | 2017-02-09 | ||
| | | |/ / | ||||
| | * | | | Cosmetics (removed one newline) | 2017-02-09 | ||
| | | | | | ||||
| | | | * | Merge remote-tracking branch 'upstream/master' into cares_bazel_rule | 2017-02-08 | ||
| | | | |\ | | |_|_|/ | |/| | | | ||||
| | | * | | Merge remote-tracking branch 'upstream/v1.1.x' into node_disable_libuv_core | 2017-02-07 | ||
| | | |\ \ | ||||
| * | | \ \ | Merge pull request #9596 from muxi/cronet-tests-in-jenkins | 2017-02-07 | ||
| |\ \ \ \ \ | | | | | | | | | | | | | | | Add Cronet core tests to Jenkins | |||
| | | | * | | | Disable libuv core changes in Node library | 2017-02-06 | ||
| | | | | | | | ||||
| | * | | | | | Add Cronet core tests to Jenkins | 2017-02-06 | ||
| | | | | | | | ||||
| | | | | * | | Merge remote-tracking branch 'upstream/v1.1.x' into ↵ | 2017-02-06 | ||
| | | | | |\ \ | | | | | |/ / | | | | |/| | | | | | | | | | automate-objc-version-advancement-v1.1.x | |||
| * | | | | | | Merge remote-tracking branch 'upstream/master' into ↵ | 2017-02-06 | ||
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | automate-objc-version-advancement | |||
* | | | | | | | | nit fixes | 2017-02-06 | ||
| | | | | | | | | ||||
| | * | | | | | | Merge pull request #9574 from stanley-cheung/php-update-gen-code-examples | 2017-02-06 | ||
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | PHP: update README and apache/nginx examples | |||
| | | | | * | | | | Fix issue #9597 | 2017-02-06 | ||
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Generate consistently named PDBs for libraries across generators and install those PDBs if present. | |||
| | * | | | | | | | Merge pull request #9534 from muxi/port-9505 | 2017-02-06 | ||
| | |\ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | | | Port #9505: Fixes for gRPC ObjC v1.1.0 release | |||
| | * | | | | | | | Merge pull request #9511 from ctiller/assert_writes | 2017-02-04 | ||
| | |\ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | | | Add a test verifying number of writes per RPC is reasonable | |||
| * | | | | | | | | Correct commet style of version.h | 2017-02-04 | ||
| | | | | | | | | | ||||
| | | | | | | * | | Correct commet style of version.h | 2017-02-04 | ||
| | | | | | | | | | ||||
| | | * | | | | | | Merge branch 'bwest' into assert_writes | 2017-02-03 | ||
| | | |\ \ \ \ \ \ | ||||
| | | | * | | | | | | Speed up bm_fullstack test | 2017-02-03 | ||
| | | | | | | | | | | ||||
| | * | | | | | | | | Put files in a better place | 2017-02-03 | ||
| | | | | | | | | | | ||||
| | | | | | | | * | | Add regeneration info to version.h | 2017-02-03 | ||
| | | | | | | | | | | ||||
| * | | | | | | | | | Add regeneration info to version.h | 2017-02-03 | ||
| | | | | | | | | | | ||||
| | | | | | * | | | | PHP: update README and apache/nginx examples | 2017-02-03 | ||
| | | | |_|/ / / / | | | |/| | | | | |