aboutsummaryrefslogtreecommitdiffhomepage
path: root/vsprojects
Commit message (Collapse)AuthorAge
* Fix merge failuresGravatar yang-g2015-08-24
|
* merge with headGravatar yang-g2015-08-24
|\
| * 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
| |/ /
* | | split stream.h into sync_stream.h and async_stream.hGravatar yang-g2015-08-21
| | |
* | | headers reorgGravatar yang-g2015-08-21
| | |
| | * Added C API functions for compression args handling (w/ tests)Gravatar David Garcia Quintas2015-08-21
| |/
* | Merge remote-tracking branch 'upstream/master' into docsGravatar yang-g2015-08-20
|\|
* | Make Channel ctor privateGravatar yang-g2015-08-20
| |
* | remove internal_stubGravatar yang-g2015-08-20
| |
| * Merge pull request #2977 from ctiller/shutdown-c++Gravatar Yang Gao2015-08-19
| |\ | | | | | | Add a deadline to Server::Shutdown
* | | Remove ChannelInterface and replace it with ChannelGravatar yang-g2015-08-19
|/ /
* | 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 pull request #2376 from rjshade/add_udp_server_2Gravatar Yang Gao2015-08-13
| |\ \ | | | | | | | | Add UDP server to gRPC.
| * | | Recreating grpc_test_util_unsecure's template.Gravatar Nicolas "Pixel" Noble2015-08-14
| | | |
| | * | 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
| | | |
* | | | Updated outdated Grpc.makGravatar David Garcia Quintas2015-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
| | | |\ | | |_|/ | |/| |
| * | | move auth property iterator declaration into auth_context.hGravatar yang-g2015-08-10
| | | |
* | | | 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 github.com:grpc/grpc into kinetic-lopsided-poetryGravatar Craig Tiller2015-08-06
| |\ \ \
| | | | * 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 pull request #2797 from jtattermusch/polishing_apiGravatar Jan Tattermusch2015-08-05
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | C# API improvements
| | | | | | | * 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
| | | | * | | | | updated .gitignoreGravatar Jan Tattermusch2015-08-04
| | | | | | | | |
| * | | | | | | | 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
| | | | | | |