Commit message (Collapse) | Author | Age | ||
---|---|---|---|---|
... | ||||
| | * | | | | | disable grpc_zookeeper target on windows | Jan Tattermusch | 2015-08-18 | |
| | | | | | | | ||||
| | | * | | | | Add a timeout to shutdown to forcefully end calls | Craig Tiller | 2015-08-18 | |
| | |/ / / / | ||||
| | * | | | | Merge branch 'master' of github.com:grpc/grpc into compression-interop | David Garcia Quintas | 2015-08-17 | |
| | |\ \ \ \ | | |/ / / / | |/| | | | | ||||
* | | | | | | Adding new header in build.json. | Julien Boeuf | 2015-08-15 | |
| | | | | | | ||||
| * | | | | | Merge pull request #2549 from hongweiwang/zookeeper | David G. Quintas | 2015-08-14 | |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Zookeeper name resolver | |||
| | | | | * \ | Merge remote-tracking branch 'upstream/master' into csharp_upgrade_to_proto3 | Jan Tattermusch | 2015-08-14 | |
| | | | | |\ \ | | |_|_|_|/ / | |/| | | | | | ||||
| * | | | | | | Merge pull request #2376 from rjshade/add_udp_server_2 | Yang Gao | 2015-08-13 | |
|/| | | | | | | | | | | | | | | | | | | | | Add UDP server to gRPC. | |||
* | | | | | | | Recreating grpc_test_util_unsecure's template. | Nicolas "Pixel" Noble | 2015-08-14 | |
| | | | | | | | ||||
| * | | | | | | Merge remote-tracking branch 'upstream/master' into add_udp_server_2 | Robbie Shade | 2015-08-13 | |
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | Conflicts: Makefile | |||
| | | * | | | | Merge branch 'master' of github.com:grpc/grpc into compression-interop | David Garcia Quintas | 2015-08-13 | |
| | | |\ \ \ \ | |_|_|/ / / / |/| | | | | | | ||||
* | | | | | | | Removing gpr_cancelable. | Nicolas "Pixel" Noble | 2015-08-13 | |
| | | | | | | | ||||
| | | * | | | | Updated outdated Grpc.mak | David Garcia Quintas | 2015-08-13 | |
| | | | | | | | ||||
| | | * | | | | Merge branch 'master' of github.com:grpc/grpc into compression-interop | David Garcia Quintas | 2015-08-13 | |
| | | |\ \ \ \ | |_|_|/ / / / |/| | | | | | | ||||
| * | | | | | | Merge remote-tracking branch 'upstream/master' into add_udp_server_2 | Robbie Shade | 2015-08-13 | |
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | | | ||||
| | | | | | * | Merge branch 'master' into tracing_api | Alistair Veitch | 2015-08-13 | |
| | | | | | |\ | |_|_|_|_|_|/ |/| | | | | | | ||||
| | | | | * | | Merge remote-tracking branch 'upstream/master' into csharp_upgrade_to_proto3 | Jan Tattermusch | 2015-08-13 | |
| | | | | |\ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/csharp/Grpc.Core/VersionInfo.cs src/csharp/Grpc.Examples.Tests/MathClientServerTests.cs src/csharp/Grpc.IntegrationTesting/Grpc.IntegrationTesting.csproj src/csharp/Grpc.IntegrationTesting/InteropClient.cs src/csharp/Grpc.IntegrationTesting/packages.config src/csharp/build_packages.bat | |||
| | | | | * | | update instructions on building protoc plugins | Jan Tattermusch | 2015-08-13 | |
| | | | | | | | ||||
| | | | | | * | add all new content | Alistair Veitch | 2015-08-13 | |
| | | | | | | | ||||
| | | | * | | | Merge remote-tracking branch 'upstream/master' | Hongyu Chen | 2015-08-11 | |
| | | | |\ \ \ | |_|_|_|/ / / |/| | | | | | | ||||
| | | | * | | | Build file changes | Hongyu Chen | 2015-08-11 | |
| | | | | | | | ||||
| | * | | | | | Merge branch 'master' of https://github.com/grpc/grpc into zookeeper | Hongwei Wang | 2015-08-10 | |
| | |\ \ \ \ \ | |_|/ / / / / |/| | | | | | | ||||
* | | | | | | | move auth property iterator declaration into auth_context.h | yang-g | 2015-08-10 | |
| |_|_|/ / / |/| | | | | | ||||
| | | * | | | Merge branch 'master' into compression-accept-encoding | David Garcia Quintas | 2015-08-09 | |
| | | |\ \ \ | |_|_|/ / / |/| | | | | | ||||
| | | | * | | add protobuf.props to plugin projects | Jan Tattermusch | 2015-08-08 | |
| | | | | | | ||||
| | | | * | | update instructions to build protoc plugins | Jan Tattermusch | 2015-08-08 | |
| | | | | | | ||||
| | | | * | | update .props for protobuf | Jan Tattermusch | 2015-08-08 | |
| |_|_|/ / |/| | | | | ||||
| | * | | | Merge branch 'master' of https://github.com/grpc/grpc into zookeeper | Hongwei Wang | 2015-08-07 | |
| | |\ \ \ | |_|/ / / |/| | | | | ||||
* | | | | | Merge github.com:grpc/grpc into kinetic-lopsided-poetry | Craig Tiller | 2015-08-06 | |
|\ \ \ \ \ | ||||
| | | * \ \ | Merge branch 'master' of https://github.com/grpc/grpc into zookeeper | Hongwei Wang | 2015-08-06 | |
| | | |\ \ \ | | |_|/ / / | |/| | | | | ||||
| | * | | | | Regenerated Makefile | Robbie Shade | 2015-08-06 | |
| | |\ \ \ \ | | |/ / / / | |/| | | | | ||||
| * | | | | | Merge pull request #2750 from ctiller/propagate | Yang Gao | 2015-08-06 | |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Core-supported context propagation | |||
| | | * \ \ \ | Regenerated project files | Robbie Shade | 2015-08-06 | |
| | | |\ \ \ \ | | |_|/ / / / | |/| | | | | | ||||
| * | | | | | | Merge pull request #2781 from yang-g/stuboptions | Abhishek Kumar | 2015-08-05 | |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | Add StubOptions | |||
* | | | | | | | | Merge github.com:grpc/grpc into kinetic-lopsided-poetry | Craig Tiller | 2015-08-05 | |
|\| | | | | | | | ||||
| * | | | | | | | Merge pull request #2797 from jtattermusch/polishing_api | Jan Tattermusch | 2015-08-05 | |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | C# API improvements | |||
| | | | | | * \ \ | Merge branch 'master' of https://github.com/grpc/grpc into zookeeper | Hongwei Wang | 2015-08-05 | |
| | | | | | |\ \ \ | | |_|_|_|_|/ / / | |/| | | | | | | | ||||
| | | | * | | | | | Merge github.com:grpc/grpc into propagate | Craig Tiller | 2015-08-05 | |
| | | | |\ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | | | ||||
| * | | | | | | | | Merge pull request #2656 from yang-g/reconnect_branch_based_on_jitter | Vijay Pai | 2015-08-05 | |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Connection backoff interop test client and server | |||
| | | * | | | | | | | updated .gitignore | Jan Tattermusch | 2015-08-04 | |
| | | | | | | | | | | ||||
| | | | | | | | | * | merge with upstream/master | Alistair Veitch | 2015-08-04 | |
| | | | | | | | | |\ | | | | |_|_|_|_|_|/ | | | |/| | | | | | | ||||
* | | / | | | | | | | Testing port server | Craig Tiller | 2015-08-04 | |
| |_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | run_tests.py will start a server (if it's not running, or if the running port server mismatches the 'current' one) that serves ports to use for tests. The server is left running after run_tests.py finishes, so that in environments such as Mac and Windows where tests run unshielded from each other, we don't start jumping on already used ports. | |||
| | | | * | | | | | Add proxy tests to end2end suite | Craig Tiller | 2015-08-04 | |
| |_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently the oauth2 variant of these tests is disabled. Will work with @jboeuf to figure out how to turn them on. | |||
| | | * | | | | | Add StubOptions | yang-g | 2015-08-03 | |
| |_|/ / / / / |/| | | | | | | ||||
| | | | * | | | Merge branch 'master' of https://github.com/grpc/grpc into zookeeper | Hongwei Wang | 2015-08-03 | |
| | | | |\ \ \ | |_|_|_|/ / / |/| | | | | | | ||||
| | * | | | | | merge with head and resolve conflicts | yang-g | 2015-08-03 | |
| | |\ \ \ \ \ | |_|/ / / / / |/| | | | | | | ||||
| * | | | | | | Merge github.com:grpc/grpc into plucking-hell | Craig Tiller | 2015-08-01 | |
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | Conflicts: Makefile | |||
| | | | * | | | Merge branch 'master' of https://github.com/grpc/grpc into zookeeper | Hongwei Wang | 2015-07-31 | |
| | | | |\ \ \ | ||||
| | | | * | | | | Add zookeeper end-to-end test | Hongwei Wang | 2015-07-31 | |
| | | | | | | | | ||||
* | | | | | | | | Merge github.com:grpc/grpc into yeah-we-know-what-youre-talking-about | Craig Tiller | 2015-07-31 | |
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: vsprojects/Grpc.mak vsprojects/grpc.sln vsprojects/grpc/grpc.vcxproj vsprojects/grpc_cpp_plugin/grpc_cpp_plugin.vcxproj vsprojects/grpc_csharp_ext/grpc_csharp_ext.vcxproj vsprojects/grpc_csharp_plugin/grpc_csharp_plugin.vcxproj vsprojects/grpc_objective_c_plugin/grpc_objective_c_plugin.vcxproj vsprojects/grpc_python_plugin/grpc_python_plugin.vcxproj vsprojects/grpc_ruby_plugin/grpc_ruby_plugin.vcxproj vsprojects/grpc_unsecure/grpc_unsecure.vcxproj | |||
| | * | | | | | | Merge github.com:grpc/grpc into plucking-hell | Craig Tiller | 2015-07-31 | |
| | |\ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: templates/vsprojects/grpc.sln.template templates/vsprojects/grpc_csharp_ext/grpc_csharp_ext.vcxproj.template templates/vsprojects/sln_defs.include templates/vsprojects/vcxproj_defs.include vsprojects/grpc.sln vsprojects/grpc_csharp_ext/grpc_csharp_ext.vcxproj |