aboutsummaryrefslogtreecommitdiffhomepage
path: root/vsprojects
Commit message (Collapse)AuthorAge
* rename census_filter.{c,h} to grpc_filter.{c,h}Gravatar Hongyu Chen2015-08-21
|
* Merge remote-tracking branch 'upstream/master'Gravatar Hongyu Chen2015-08-20
|\
| * Merge pull request #2977 from ctiller/shutdown-c++Gravatar Yang Gao2015-08-19
| |\ | | | | | | Add a deadline to Server::Shutdown
* | | Move census_filters from .../channel to .../censusGravatar Hongyu Chen2015-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 remote-tracking branch 'upstream/master'Gravatar Hongyu Chen2015-08-11
|\ \ \ \ \ | | |/ / / | |/| | |
* | | | | Build file changesGravatar Hongyu Chen2015-08-11
| | | | |
| | | | * 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
| | | | | | |
* | | | | | | 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 github.com:grpc/grpc into plucking-hellGravatar Craig Tiller2015-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
| * | | | | | Merge pull request #2731 from nicolasnoble/regen-and-vs-tweaksGravatar Jan Tattermusch2015-07-30
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Regenerating project files and massaging VS project files.
| | * | | | | | Regenerating project files and massaging VS project files.Gravatar Nicolas Noble2015-07-30
| | | | | | | |
| | | * | | | | Merge github.com:grpc/grpc into plucking-hellGravatar Craig Tiller2015-07-30
| | | |\ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| | | * | | | | Merge branch 'regen-and-vs-tweaks' of github.com:nicolasnoble/grpc into ↵Gravatar Craig Tiller2015-07-30
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | tepid-tarantula
| | | | * | | | | Regenerating project files and massaging VS project files.Gravatar Nicolas Noble2015-07-31
| | | |/ / / / / | | |/| | | | |
| * | | | | | | merge with master, fix build issueGravatar Alistair Veitch2015-07-30
| | | | | | | |