aboutsummaryrefslogtreecommitdiffhomepage
path: root/build.json
Commit message (Collapse)AuthorAge
* Merge branch 'master' into frayGravatar Vijay Pai2015-08-24
|\
| * Merge pull request #3019 from dgquintas/channel_args_compressionGravatar Yang Gao2015-08-24
| |\ | | | | | | Added C API functions for compression args handling (w/ tests)
| * | Remove accidental dependency on zookeeper in shutdown_testGravatar Craig Tiller2015-08-24
| | |
* | | Eliminate public thread-pool interfaceGravatar Vijay Pai2015-08-24
|/ /
| * Added C API functions for compression args handling (w/ tests)Gravatar David Garcia Quintas2015-08-21
|/
* Merge pull request #2995 from ctiller/timewhatGravatar David G. Quintas2015-08-19
|\ | | | | Exclude qps_test from tsan runs
* \ Merge pull request #2977 from ctiller/shutdown-c++Gravatar Yang Gao2015-08-19
|\ \ | | | | | | Add a deadline to Server::Shutdown
| | * Exclude qps_test from tsan runsGravatar Craig Tiller2015-08-19
| |/ |/| | | | | | | | | | | The TSAN deadlock detector has some problems that prevents this test from running successfully. Issue #2994 has been filed to re-enable these in the future.
* | disable grpc_zookeeper target on windowsGravatar Jan Tattermusch2015-08-18
| |
| * Add a timeout to shutdown to forcefully end callsGravatar Craig Tiller2015-08-18
|/
* Merge branch 'master' of github.com:grpc/grpc into compression-interopGravatar David Garcia Quintas2015-08-17
|\
| * Merge pull request #2549 from hongweiwang/zookeeperGravatar David G. Quintas2015-08-14
| |\ | | | | | | Zookeeper name resolver
| * \ Merge remote-tracking branch 'upstream/master' into add_udp_server_2Gravatar Robbie Shade2015-08-13
| |\ \ | | | | | | | | | | | | | | | | Conflicts: Makefile
* | \ \ Merge branch 'master' of github.com:grpc/grpc into compression-interopGravatar David Garcia Quintas2015-08-13
|\ \ \ \ | | |/ / | |/| |
| * | | Removing gpr_cancelable.Gravatar Nicolas "Pixel" Noble2015-08-13
| | | |
* | | | Merge branch 'master' of github.com:grpc/grpc into compression-interopGravatar David Garcia Quintas2015-08-13
|\| | |
| | * | Merge remote-tracking branch 'upstream/master' into add_udp_server_2Gravatar Robbie Shade2015-08-13
| | |\ \ | | |/ / | |/| |
| | | * Merge branch 'master' of https://github.com/grpc/grpc into zookeeperGravatar Hongwei Wang2015-08-10
| | | |\ | | |_|/ | |/| |
| * | | Merge pull request #2875 from yang-g/test_unsecureGravatar Nicolas Noble2015-08-10
| |\ \ \ | | | | | | | | | | move auth property iterator declaration into auth_context.h
| * \ \ \ Merge pull request #2864 from jtattermusch/0.10-upportGravatar Nicolas Noble2015-08-10
| |\ \ \ \ | | | | | | | | | | | | Upporting from 0.10 branch.
| | | * | | move auth property iterator declaration into auth_context.hGravatar yang-g2015-08-10
| | |/ / / | |/| | |
* | | | | Merge branch 'compression-accept-encoding' into compression-interopGravatar David Garcia Quintas2015-08-09
|\ \ \ \ \
| * | | | | Merge branch 'master' into compression-accept-encodingGravatar David Garcia Quintas2015-08-09
| |\| | | |
| | | | | * Merge branch 'master' of https://github.com/grpc/grpc into zookeeperGravatar Hongwei Wang2015-08-07
| | | | | |\ | | | |_|_|/ | | |/| | |
| | | | | * Merge branch 'master' of https://github.com/grpc/grpc into zookeeperGravatar Hongwei Wang2015-08-06
| | | | | |\
| | * | | | \ Merge github.com:grpc/grpc into kinetic-lopsided-poetryGravatar Craig Tiller2015-08-06
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | |
| | | * | | | Merge pull request #2800 from ctiller/reduce-mac-loadGravatar Nicolas Noble2015-08-06
| | | |\ \ \ \ | | | | | | | | | | | | | | | | Reduce mac load on Jenkins
| | | | | | | * Merge branch 'master' of https://github.com/grpc/grpc into zookeeperGravatar Hongwei Wang2015-08-06
| | | | | | | |\ | | | | |_|_|_|/ | | | |/| | | |
| | | | | | * | Regenerated MakefileGravatar Robbie Shade2015-08-06
| | | | | | |\ \ | | | | |_|_|/ / | | | |/| | | |
| | | * | | | | Merge pull request #2750 from ctiller/propagateGravatar Yang Gao2015-08-06
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | Core-supported context propagation
| | | | | | | * \ Regenerated project filesGravatar Robbie Shade2015-08-06
| | | | | | | |\ \ | | | | |_|_|_|/ / | | | |/| | | | |
| | | * | | | | | Merge pull request #2781 from yang-g/stuboptionsGravatar Abhishek Kumar2015-08-05
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Add StubOptions
| | * | | | | | | | Merge github.com:grpc/grpc into kinetic-lopsided-poetryGravatar Craig Tiller2015-08-05
| | |\| | | | | | |
| | | | | | * | | | Merge branch 'propagate' into reduce-mac-loadGravatar Craig Tiller2015-08-05
| | | | | | |\ \ \ \ | | | | | | |/ / / / | | | | | |/| | | |
| | | | | | | | | * Merge branch 'master' of https://github.com/grpc/grpc into zookeeperGravatar Hongwei Wang2015-08-05
| | | | | | | | | |\ | | | | |_|_|_|_|_|/ | | | |/| | | | | |
| | | | | * | | | | Merge github.com:grpc/grpc into propagateGravatar Craig Tiller2015-08-05
| | | | | |\ \ \ \ \ | | | | |_|/ / / / / | | | |/| | | | | |
| | | * | | | | | | Merge pull request #2656 from yang-g/reconnect_branch_based_on_jitterGravatar Vijay Pai2015-08-05
| | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Connection backoff interop test client and server
| | | | | | | * | | | Add linux, mac as test platforms, only run _with_poll tests on linuxGravatar Craig Tiller2015-08-05
| | | | | | |/ / / /
| | * | | | | | | | Testing port serverGravatar Craig Tiller2015-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 suiteGravatar Craig Tiller2015-08-04
| | | |_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently the oauth2 variant of these tests is disabled. Will work with @jboeuf to figure out how to turn them on.
| | | | | * | | | Add StubOptionsGravatar yang-g2015-08-03
| | | |_|/ / / / | | |/| | | | |
| | | | | | | * Merge branch 'master' of https://github.com/grpc/grpc into zookeeperGravatar Hongwei Wang2015-08-03
| | | | | | | |\ | | | |_|_|_|_|/ | | |/| | | | |
| | | | * | | | merge with head and resolve conflictsGravatar yang-g2015-08-03
| | | | |\ \ \ \ | | | |_|/ / / / | | |/| | | | |
| | | * | | | | Merge github.com:grpc/grpc into plucking-hellGravatar Craig Tiller2015-08-01
| | | |\ \ \ \ \ | | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | Conflicts: Makefile
| | | | | | | * Merge branch 'master' of https://github.com/grpc/grpc into zookeeperGravatar Hongwei Wang2015-07-31
| | | | | | | |\
| | | | | | | * | Add zookeeper end-to-end testGravatar Hongwei Wang2015-07-31
| | | | | | | | |
| | * | | | | | | Merge github.com:grpc/grpc into yeah-we-know-what-youre-talking-aboutGravatar Craig Tiller2015-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 pull request #2731 from nicolasnoble/regen-and-vs-tweaksGravatar Jan Tattermusch2015-07-30
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Regenerating project files and massaging VS project files.
| | | | | | | * | | bump C# version to 0.6.1 and core version to 0.10.1Gravatar Jan Tattermusch2015-07-31
| | | | |_|_|/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/csharp/Grpc.Core/Version.cs
| | | | * | | | | Regenerating project files and massaging VS project files.Gravatar Nicolas Noble2015-07-30
| | | | | | | | |