Commit Graph

1028 Commits

Author SHA1 Message Date
Craig Tiller 70ab4c5cef Merge github.com:grpc/grpc into fix-proto-docker 2016-02-22 22:29:51 -08:00
Craig Tiller c866f7281f Merge github.com:grpc/grpc into naming-crisis 2016-02-22 22:23:43 -08:00
Craig Tiller 521423c8cf Regenerate files, fix bugs 2016-02-22 22:22:22 -08:00
Craig Tiller 6895168e0a Merge github.com:grpc/grpc into filter-selection 2016-02-22 21:41:31 -08:00
Vijay Pai 349bba9179 Merge pull request #5257 from ctiller/cleaner-posix
Separate timer checking from pollsets
2016-02-22 16:30:18 -08:00
Alistair Veitch 7771544111 rename census log files to avoid build breakage on MacOS 2016-02-22 14:20:25 -08:00
Craig Tiller 1a969c86f4 Start migrating code into ev_XXX 2016-02-22 12:13:16 -08:00
Masood Malekghassemi 9f79159590 Merge pull request #5302 from nicolasnoble/python-windows
Enabling python artifact building for Windows.
2016-02-22 11:37:22 -08:00
Jan Tattermusch a0d7ea6410 generated projects 2016-02-22 08:49:14 -08:00
Craig Tiller dd4531fd33 Merge github.com:grpc/grpc into cleaner-posix 2016-02-21 22:09:06 -08:00
David Garcia Quintas 3711e83870 moar VS fun 2016-02-19 16:58:16 -08:00
David Garcia Quintas 9f3955c953 Fixed language category for grpc_codegen_lib 2016-02-19 14:54:48 -08:00
David Garcia Quintas aee7cf1d32 added uuids for VS 2016-02-19 14:05:47 -08:00
David Garcia Quintas 4af3de2d6f actually made the codegen_lib targets private now 2016-02-19 13:57:55 -08:00
Craig Tiller 04239b9045 Merge github.com:grpc/grpc into cleaner-posix2 2016-02-19 13:07:39 -08:00
Craig Tiller de676268aa Reinstate sockpair tests 2016-02-19 12:28:34 -08:00
Nicolas "Pixel" Noble 2e8fdbac77 Building the dlls. 2016-02-19 05:39:15 +01:00
Nicolas "Pixel" Noble 3ba2eba9eb Adding grpc_dll project. 2016-02-19 01:39:59 +01:00
David Garcia Quintas bac76af099 Fixed sanity 2016-02-18 15:56:40 -08:00
yang-g 7d2a3e1917 Refactor end2end_test. Make the credentials a separate library. 2016-02-18 15:41:56 -08:00
David Garcia Quintas a37d9d8c59 moved grpc_library.cc moved out of codegen 2016-02-18 15:30:56 -08:00
David Garcia Quintas 2173eea18b Merge branch 'master' of github.com:grpc/grpc into codegen_lib 2016-02-18 15:13:54 -08:00
David Garcia Quintas a8bb0bfc3e Split codegen target and made it libs 2016-02-18 15:09:02 -08:00
Craig Tiller 8d8246ecc6 Merge branch 'cleaner-posix' into cleaner-posix2 2016-02-18 07:40:26 -08:00
Craig Tiller 9dc184fd95 Merge github.com:grpc/grpc into cleaner-posix 2016-02-18 07:21:17 -08:00
Craig Tiller 16f6826ffd Merge github.com:grpc/grpc into fix-proto-docker 2016-02-18 07:14:37 -08:00
Craig Tiller 178edfae2b Decouple filter selection from channel construction
Allow plugins to extend the set of filters used by gRPC core:
- plugins at construction time can register against the 'channel_init' system to be allowed to mutate a new channel_stack_builder type
- channel_stack_builder provides a central and rather dynamic place to construct the list of filters required by a channel stack
- ultimately we construct the channel stack in the fashion we always have

This is also a prerequisite step to allowing filters to be implemented from wrapped languages.
2016-02-17 20:54:46 -08:00
Craig Tiller c0ce00fd16 Merge github.com:grpc/grpc into sceq 2016-02-17 14:25:12 -08:00
David Garcia Quintas 4feb3502c2 Fixed header dependencies and copyrights 2016-02-16 17:18:31 -08:00
David Garcia Quintas d71ff05b51 Added codegen_lib target 2016-02-16 16:12:48 -08:00
Yang Gao 6d65ee4110 Merge pull request #5209 from vjpai/why_lever
Delete fixed_size_thread_pool
2016-02-16 14:12:04 -08:00
Bogdan Drutu 43f6311c58 Merge pull request #5098 from a-veitch/base_log
Add Census base log
2016-02-16 09:54:31 -08:00
Craig Tiller 5a6644602e Moving fd code into ev code 2016-02-16 08:07:17 -08:00
Craig Tiller ccdea1900f Separate timer checking from pollsets 2016-02-16 08:06:46 -08:00
Craig Tiller eb841e2010 Revert "Revert "Proto API for LB request/responses"" 2016-02-11 15:49:16 -08:00
Craig Tiller c35e2c582f Revert "Proto API for LB request/responses" 2016-02-11 15:45:03 -08:00
Craig Tiller c3602dc1cf Merge pull request #4038 from dgquintas/grpclb_api
Proto API for LB request/responses
2016-02-11 15:32:22 -08:00
vjpai fd307efbd1 fixed_size_thread_pool : why do we even have that lever? It has been
deprecated and unused for quite some time.
2016-02-11 14:56:23 -08:00
Alistair Veitch 749250f6a0 merge to HEAD 2016-02-11 09:23:20 -08:00
David Garcia Quintas 742a783c0d Merge branch 'master' of github.com:grpc/grpc into grpclb_api 2016-02-11 01:04:28 -08:00
Vijay Pai 29e1d95a21 Revive gpr 2016-02-11 00:26:18 -08:00
Vijay Pai 8ae883fc8f Merge branch 'master' into alarm_mods 2016-02-11 00:20:31 -08:00
vjpai f9f61cf5bc Properly specify dependences on alarm.h in build.yaml 2016-02-10 20:51:53 -08:00
vjpai 04e992a750 Make C++ alarm class usable and testable - there were some build issues and
it was not actually even included in the library or the test suite.
2016-02-10 16:58:38 -08:00
Craig Tiller f73429901a Merge github.com:grpc/grpc into sceq 2016-02-09 16:32:51 -08:00
Craig Tiller ad09598ae5 Further cleanup 2016-02-09 12:45:04 -08:00
Craig Tiller 4a67be42a0 Further cleanup 2016-02-09 12:40:32 -08:00
Craig Tiller 1298afd10e Get compilation working again 2016-02-09 12:29:17 -08:00
Craig Tiller da179ce598 Rollback gpr deletion 2016-02-09 12:01:53 -08:00
David Garcia Quintas 7e46618897 Merge branch 'master' of github.com:grpc/grpc into grpclb_api 2016-02-08 20:07:19 -08:00
Alistair Veitch 2e7d06703d merge 2016-02-08 13:07:07 -08:00
Alistair Veitch f0571b5c87 unbreak merge 2016-02-05 13:41:33 -08:00
Alistair Veitch ba6065f016 merge 2016-02-05 13:27:42 -08:00
Alistair Veitch 9ded5dbf35 fix missed merge issue 2016-02-03 11:24:11 -08:00
Alistair Veitch 46b9d5b408 fix broken merge of build.yaml 2016-02-03 09:06:48 -08:00
Alistair Veitch 6f2b8993fd merge 2016-02-03 09:02:46 -08:00
Alistair Veitch 85afe71d4c initial commit 2016-02-02 17:58:15 -08:00
Nicolas "Pixel" Noble 89d8ed1b91 Merge branch 'master' of github.com:grpc/grpc into make-ruby-installable
Conflicts:
	BUILD
	Makefile
	binding.gyp
	build.yaml
	gRPC.podspec
	grpc.gemspec
	package.json
	src/python/grpcio/grpc_core_dependencies.py
	templates/Makefile.template
	tools/doxygen/Doxyfile.core.internal
	tools/run_tests/sources_and_headers.json
	vsprojects/vcxproj/gpr/gpr.vcxproj
	vsprojects/vcxproj/gpr/gpr.vcxproj.filters
2016-02-03 01:27:46 +01:00
Alistair Veitch ddb163a0e4 merge 2016-02-02 13:33:44 -08:00
Nicolas Noble 9e9e2f721f Merge pull request #5007 from ctiller/memcpy3
Use old memcpy for wrappers
2016-02-02 13:29:51 -08:00
Nicolas "Pixel" Noble 8696d577d6 Merge branch 'master' of github.com:grpc/grpc into make-ruby-installable 2016-02-02 20:14:56 +01:00
Alistair Veitch 75d5c0f024 post merge 2016-02-02 09:43:02 -08:00
Craig Tiller 841c726140 Merge github.com:grpc/grpc into sceq 2016-02-02 09:23:22 -08:00
Craig Tiller 4bef7cebe6 Use old memcpy for wrappers 2016-02-02 08:38:43 -08:00
Vijay Pai 03ba4d746a Merge branch 'master' into corelimit2 2016-02-01 08:17:27 -08:00
Craig Tiller f09fb7e4b0 Merge pull request #4979 from nicolasnoble/win32_subprocess
Adding windows support for gpr subprocesses.
2016-02-01 07:35:10 -08:00
Craig Tiller cbc4629c52 Merge pull request #4978 from nicolasnoble/alarming
Fixing, using and testing alarm code.
2016-01-31 18:11:03 -08:00
Nicolas "Pixel" Noble cf37cb9f9e Merge branch 'census-placeholders' into make-ruby-installable
Conflicts:
	package.json
	tools/doxygen/Doxyfile.core.internal
2016-01-31 09:34:46 +01:00
Nicolas "Pixel" Noble fa132c2f56 Actually moving this to the proper place. 2016-01-31 09:31:15 +01:00
Nicolas "Pixel" Noble d2f20efcd8 Regenerating files. 2016-01-31 07:52:59 +01:00
Nicolas "Pixel" Noble 1ed8588d4d Merge branch 'alarming' into make-ruby-installable 2016-01-31 07:36:03 +01:00
Nicolas "Pixel" Noble c6473ec9f6 Adding missing project files. 2016-01-31 07:35:39 +01:00
Nicolas "Pixel" Noble 78825caeeb Merge branch 'win32_subprocess' into make-ruby-installable
Conflicts:
	BUILD
	Makefile
	binding.gyp
	build.yaml
	gRPC.podspec
	grpc.gemspec
	src/python/grpcio/grpc_core_dependencies.py
	tools/run_tests/sources_and_headers.json
	vsprojects/vcxproj/gpr/gpr.vcxproj
	vsprojects/vcxproj/gpr/gpr.vcxproj.filters
2016-01-31 07:08:20 +01:00
Nicolas "Pixel" Noble 4fba286e4d Adding windows support for gpr subprocesses. 2016-01-31 07:00:53 +01:00
Nicolas "Pixel" Noble bf192eff56 Merge branch 'alarming' into make-ruby-installable
Conflicts:
	tools/run_tests/sources_and_headers.json
2016-01-31 06:25:39 +01:00
Nicolas "Pixel" Noble d5d83aa33f Fixing, using and testing alarm code. 2016-01-31 06:21:49 +01:00
Nicolas "Pixel" Noble 09121799b0 Removing gpr as a separated library. 2016-01-30 09:34:22 +01:00
David Garcia Quintas 366c531f3d updated projects 2016-01-29 15:12:51 -08:00
David Garcia Quintas dd18c4a4a3 Merge branch 'master' of github.com:grpc/grpc into grpclb_api 2016-01-29 15:05:53 -08:00
David Garcia Quintas fb01883859 Merge branch 'master' of github.com:grpc/grpc into grpclb_api 2016-01-28 14:39:54 -08:00
David Garcia Quintas d79ef3af71 Fixed wrong usage of global var 2016-01-28 00:21:27 -08:00
David Garcia Quintas 6bd7b97dc6 DONE!!1one 2016-01-27 19:21:12 -08:00
David Garcia Quintas e1300deb87 After GrpcLibrary refactoring. Compiles and passes. WIP still 2016-01-27 18:41:26 -08:00
David Garcia Quintas 6a48405ed0 pre sync_stream.cc creation. Does not compile 2016-01-25 19:12:37 -08:00
David Garcia Quintas b523c732d1 async_stream.h done. Compiles 2016-01-25 18:22:28 -08:00
David Garcia Quintas 2425bbbc55 Further work. Compiles. WIP 2016-01-25 17:32:48 -08:00
David Garcia Quintas 541db25d45 Merge branch 'master' of github.com:grpc/grpc into sync-async-plus-interfaces 2016-01-25 12:53:50 -08:00
Craig Tiller d8e6f8d4f5 Merge github.com:grpc/grpc into sceq 2016-01-22 19:24:23 -08:00
Craig Tiller f968a87e3f Fix build 2016-01-22 16:07:42 -08:00
Bogdan Drutu fc65bf07e6 Merge pull request #4750 from a-veitch/tag_set
Census Tag Set API and implementation
2016-01-22 15:34:34 -08:00
Jan Tattermusch dadf6ba897 Merge pull request #4812 from ctiller/integrate-zlib
Make zlib a first class build citizen
2016-01-22 14:02:34 -08:00
Michael Lumish 292a8afd11 Merge pull request #4820 from jtattermusch/new_csharp_nuget
Revamp C# Nuget package
2016-01-22 13:07:06 -08:00
David Garcia Quintas 347d58bb9a Merge branch 'master' of github.com:grpc/grpc into sync-async-plus-interfaces 2016-01-21 18:06:51 -08:00
David Garcia Quintas ddcb53a9de made codegen targets in build.yaml 2016-01-21 17:48:34 -08:00
Jan Tattermusch f087ec0f4c revamp native package building 2016-01-21 14:49:25 -08:00
David Garcia Quintas edc87ecad1 more dependency/sanity fixes 2016-01-21 13:30:13 -08:00
Craig Tiller f813f57ec5 Clean up Windows 2016-01-21 13:20:29 -08:00
Craig Tiller 3dca23aa0d Make zlib a first class build citizen 2016-01-21 11:44:55 -08:00
David Garcia Quintas 898588ba33 added missing codegen deps for grp 2016-01-21 11:14:49 -08:00
David Garcia Quintas 08a0a3306e Made "codedgen" directories closed over #includes 2016-01-21 01:04:36 -08:00
Jan Tattermusch 7c60b276de Merge remote-tracking branch 'upstream/release-0_12' into integrate_0_12_changes 2016-01-20 18:23:13 -08:00
David Garcia Quintas a396276cde regenerated projects 2016-01-20 14:27:56 -08:00
David Garcia Quintas 167221423b Regenerated projects 2016-01-20 11:11:55 -08:00
vjpai c803442204 Rename coresched --> limit_cores 2016-01-19 15:32:42 -08:00
yang-g 1ac3093450 re-generate projects 2016-01-19 09:48:09 -08:00
vjpai f6269a4dca Merge branch 'master' into corelimit2 2016-01-19 08:01:47 -08:00
Craig Tiller b22aeae462 Merge github.com:grpc/grpc into sceq 2016-01-15 21:13:52 -08:00
Craig Tiller 694cf8b0d2 Shared subchannel sketch 2016-01-15 21:13:25 -08:00
Alistair Veitch 0923126cf8 Merge branch 'master' into tag_set 2016-01-15 17:57:56 -08:00
David Garcia Quintas 8a5d195e4a re-gend projects 2016-01-15 14:20:09 -08:00
David Garcia Quintas aa9b01c7c0 Merge branch 'master' of github.com:grpc/grpc into grpclb_api 2016-01-15 14:19:17 -08:00
yang-g 512c4f7447 Merge remote-tracking branch 'upstream/master' into sync_async_mix 2016-01-15 14:09:24 -08:00
Nicolas Noble 166e749de8 Merge pull request #4696 from jtattermusch/win_static_deps
Link grpc_csharp_ext dependencies on Windows statically
2016-01-15 14:04:18 -08:00
Nicolas Noble a29a0725ba Merge pull request #4688 from jtattermusch/static_deps
Statically link dependencies of grpc_csharp_ext
2016-01-15 13:28:00 -08:00
yang-g 9f17314a35 move utilities to a separate file 2016-01-15 12:46:40 -08:00
yang-g 8053d2feb6 Merge remote-tracking branch 'upstream/master' into sync_async_mix 2016-01-15 08:53:15 -08:00
yang-g 77c63333a6 Add new public header 2016-01-14 16:09:04 -08:00
yang-g d6f7d99dc6 Add a hybrid end2end test mixing sync and async methods 2016-01-14 16:04:20 -08:00
Nicolas "Pixel" Noble 69dcff5261 Re-ordering interdependent proto files. 2016-01-14 00:34:44 +01:00
murgatroid99 b70206fe52 Merge branch 'master' into release-0_12_master_merge 2016-01-13 11:42:18 -08:00
Vijay Pai 0e66efdadd Make core limitation work for both client and server so that we can run tests on the same
machine if desired. The core_list flags to qps_driver are comma-separated lists of
core numbers.
2016-01-13 11:15:49 -08:00
Alistair Veitch 0f690721bd Move encode/decode API into census.h 2016-01-13 09:08:38 -08:00
Alistair Veitch f190601e60 Merge branch 'master' into tag_set 2016-01-12 17:38:33 -08:00
Alistair Veitch bb30d2591f initial commit 2016-01-12 17:36:05 -08:00
Jan Tattermusch d233543073 Cleanup of grpc.csharp.native package 2016-01-12 16:19:19 -08:00
Jan Tattermusch fbaf8518e4 regenerate vsprojects 2016-01-12 12:43:34 -08:00
Jan Tattermusch 0f582a2198 regenerate makefile 2016-01-12 11:26:42 -08:00
David Garcia Quintas 82a0bdc314 Merge branch 'master' of github.com:grpc/grpc into grpclb_api 2016-01-11 14:08:29 -08:00
David Garcia Quintas 756a36cdac Srcs and hdrs sanity checks skip third_party 2016-01-11 11:31:19 -08:00
David Garcia Quintas 4dfe317e5d Merge branch 'master' of github.com:grpc/grpc into grpclb_api 2016-01-08 15:50:45 -08:00
murgatroid99 207b07165e Update after cloning boringssl 2016-01-08 12:52:53 -08:00
murgatroid99 8b791a4a7f Merged from master and resolved merge conflicts 2016-01-08 12:33:22 -08:00
Craig Tiller 54ed674d40 Merge github.com:grpc/grpc into proto_names 2016-01-06 17:05:34 -08:00
murgatroid99 c3910cadb4 Expose core metadata validation functions in public headers 2016-01-06 13:14:23 -08:00
jboeuf 0850640213 Merge pull request #4589 from ctiller/enforcer
Add a test to ensure public core headers are C89
2016-01-06 12:51:58 -08:00
Craig Tiller 889d50ff21 Fix newline at end of file 2016-01-04 16:24:39 -08:00
Craig Tiller cb6ce54e31 Update copyrights 2016-01-04 16:24:26 -08:00
Michael Lumish 648da525a8 Merge pull request #4563 from ctiller/copying
Update copyrights
2016-01-04 11:15:08 -08:00
Craig Tiller ab23045414 Add a test that public headers compile as C99 2016-01-04 08:18:43 -08:00
David Garcia Quintas 8974a6681c Merge branch 'master' of github.com:grpc/grpc into grpclb_api 2015-12-24 19:36:38 +01:00
Craig Tiller 769567e769 Eliminate a layer of libraries in the end2end tests 2015-12-22 15:36:52 -08:00
Craig Tiller b10f05e91d Fix newline at end of file 2015-12-22 15:11:19 -08:00
Craig Tiller 897e4fe2ad Update copyrights 2015-12-22 15:03:40 -08:00
Craig Tiller 00f8702c5e Merge branch 'yawn' into proto_names 2015-12-22 14:23:51 -08:00
Craig Tiller 2e14b1f588 Merge github.com:grpc/grpc into proto_names 2015-12-22 14:19:40 -08:00
Craig Tiller 77fc4d35e4 BoringSSL: vsproject changes 2015-12-22 12:51:27 -08:00
Craig Tiller 66953c1c08 Merge pull request #4536 from jtattermusch/buildtests_c_is_no_cpp
Don't include grpc++ in buildtests_c
2015-12-18 12:53:29 -08:00
Yang Gao 11169d9a2c Merge pull request #4384 from ctiller/big_data
Add a test that overflows incoming flow control windows
2015-12-18 11:40:49 -08:00
Jan Tattermusch 83405c13b6 dont include grpc++ in buildtests_c 2015-12-18 10:56:31 -08:00
Jan Tattermusch 83a23815b0 remove unused vsprojects 2015-12-18 09:25:20 -08:00
Jan Tattermusch 44fc7200f8 regenerate project files 2015-12-18 08:53:59 -08:00
Jan Tattermusch 6b20f6f46d make intermediate dir path shorter 2015-12-18 08:53:59 -08:00
Craig Tiller 01294c206f Merge pull request #4524 from jtattermusch/polish_vcxproj_files
Polish vcxproj files
2015-12-18 07:38:53 -08:00
Jan Tattermusch 025ffeff5e ignore warning LNK4217 2015-12-18 06:58:11 -08:00
Craig Tiller 1b4e33029e Consolidate C++ proto files under src/proto
- make the directory structure match the package structure
- sanitize the package structure (test --> testing)
- add auto-detection of proto file dependencies
2015-12-17 16:35:00 -08:00
Jan Tattermusch ec59bc7f1a regenerate project files 2015-12-17 16:21:04 -08:00
Craig Tiller 86e8ad8ddf Merge github.com:grpc/grpc into big_data 2015-12-16 19:25:58 -08:00
David Garcia Quintas 7052ac25e6 Merge branch 'master' of github.com:grpc/grpc into grpclb_api 2015-12-16 17:36:04 -08:00
Craig Tiller 83399c99e5 Add a test that reproduces server partial message read bug 2015-12-14 13:34:44 -08:00
Craig Tiller ab0ea829ac ASAN, Sanity fixes 2015-12-12 18:53:08 -08:00
Nicolas Noble 1e54d284cb Merge pull request #4420 from ctiller/slops
Hit a few more paths in http_server_filter.c, sockaddr_resolver.c
2015-12-11 20:59:47 -08:00
Craig Tiller 3e3a26598f Add missing vcproj 2015-12-11 20:35:02 -08:00
Jan Tattermusch 1aa50eb2c4 Merge pull request #4315 from jtattermusch/detect_platformtoolset
stop using _USE_32BIT_TIME_T and autodetect PlatformToolset on VS2015
2015-12-11 19:14:44 -08:00
Craig Tiller 82821ba778 Merge pull request #4438 from nicolasnoble/json-coverage-2
Increasing json code coverage.
2015-12-11 17:59:03 -08:00
Nicolas "Pixel" Noble 11c320da08 Increasing json code coverage. 2015-12-12 02:42:39 +01:00
Jan Tattermusch df744bd389 regenerated vsproject files 2015-12-11 15:56:19 -08:00
David G. Quintas 8c9dfd02bc Merge pull request #4430 from ctiller/dns
Add dns resolver test
2015-12-11 15:01:25 -08:00
David G. Quintas ce015f647a Merge pull request #4381 from dgquintas/compression_coverage_2
Further coverage for compression
2015-12-11 14:51:50 -08:00
David Garcia Quintas 48ec806249 Done! 2015-12-11 14:04:59 -08:00
Craig Tiller 147c4f4662 Add dns resolver test 2015-12-11 12:32:39 -08:00
yang-g 14bdea1853 Merge remote-tracking branch 'upstream/master' into fixit_server_c 2015-12-11 10:34:09 -08:00
Yang Gao 12fa8c83af Merge pull request #4325 from ctiller/ping-ping-ping-ping-ping-ping-ping-ping-ping
Ping support for channels
2015-12-11 10:32:43 -08:00
Craig Tiller 795764bf3a Hit a few more paths in http_server_filter.c, sockaddr_resolver.c 2015-12-11 08:56:09 -08:00
Sree Kuchibhotla c54f88ee8d Merge pull request #4403 from yang-g/fixit_secure_channel_create_c
add a test for secure_channel_create and fix cleanup code
2015-12-10 20:33:16 -08:00
Craig Tiller b8bd62e975 Add a test for sockaddr_resolver 2015-12-10 15:51:15 -08:00
Craig Tiller aae3b8cddc Merge github.com:grpc/grpc into ping-ping-ping-ping-ping-ping-ping-ping-ping 2015-12-10 14:43:04 -08:00
yang-g c3d94fb82a add tests for public server apis 2015-12-10 14:38:00 -08:00
Craig Tiller a75ae6ee8a Merge github.com:grpc/grpc into census_suite 2015-12-10 14:36:02 -08:00
Craig Tiller 13180c8a2c Merge github.com:grpc/grpc into ping-ping-ping-ping-ping-ping-ping-ping-ping 2015-12-10 14:30:21 -08:00
Yang Gao 4b6974ca8c Merge pull request #4232 from ctiller/connected-subchannel
Change subchannel connectivity state transition graph
2015-12-10 14:29:25 -08:00
yang-g d482e59d3a add a test for secure_channel_create and fix cleanup code 2015-12-10 14:04:00 -08:00
Craig Tiller c586f4e9be Expand census coverage: make this a fixture instead of a simple test 2015-12-10 10:26:05 -08:00
yang-g 59d9f71b44 merge with head 2015-12-10 09:50:57 -08:00
Craig Tiller 150109576c Merge branch 'connected-subchannel' into ping-ping-ping-ping-ping-ping-ping-ping-ping 2015-12-10 08:27:59 -08:00
Craig Tiller 13830d0097 Merge github.com:grpc/grpc into connected-subchannel 2015-12-10 08:26:43 -08:00
David G. Quintas 4e9433990f Merge pull request #4366 from ctiller/connectivity-state
Add a test for grpc_connectivity_state_name
2015-12-10 08:14:48 -08:00
Craig Tiller d5bd3b6abe Merge branch 'connected-subchannel' into ping-ping-ping-ping-ping-ping-ping-ping-ping 2015-12-10 07:19:54 -08:00
Craig Tiller de04aa12fd Merge github.com:grpc/grpc into connected-subchannel 2015-12-10 07:16:52 -08:00
Craig Tiller dd4b0000b6 Merge pull request #4286 from jtattermusch/win_64bit
Make grpc compile on win64bit
2015-12-09 22:09:59 -08:00
Craig Tiller 3b66ab9f9e Window overflow test 2015-12-09 19:42:22 -08:00
yang-g 59cd467a74 merge with head 2015-12-09 15:39:39 -08:00
Craig Tiller b897337994 Merge github.com:grpc/grpc into connectivity-state 2015-12-09 15:34:27 -08:00
Craig Tiller 9bfc2ce06c Merge pull request #4369 from dgquintas/custom_allocs
Added ability to override mem alloc funcs
2015-12-09 15:30:29 -08:00
Craig Tiller e54da0e7c9 Merge github.com:grpc/grpc into connected-subchannel 2015-12-09 15:29:46 -08:00
Nicolas Noble 6994f4949f Merge pull request #4360 from ctiller/who-needs-a-noop-anyway
Kill noop_filter.c
2015-12-09 15:21:57 -08:00
David Garcia Quintas 3ff5d2dd6b Merge branch 'master' of github.com:grpc/grpc into custom_allocs 2015-12-09 14:20:38 -08:00
David Garcia Quintas a5aa19b8b6 PR comments 2015-12-09 14:17:52 -08:00
yang-g 95ee080883 merge with head 2015-12-09 11:26:43 -08:00
Craig Tiller 3824b6e976 Merge github.com:grpc/grpc into connectivity-state 2015-12-09 11:19:59 -08:00
Craig Tiller 179e6febd2 Add a test for grpc_connectivity_state_name 2015-12-09 11:09:47 -08:00