Commit Graph

344 Commits

Author SHA1 Message Date
Craig Tiller 08a1cf8f4f Use connectivity state tracking code in chttp2 transport 2015-06-29 09:37:52 -07:00
Craig Tiller 4d74056b08 Merge branch 'forever-is-a-long-time' into tis-but-thy-name
Conflicts:
	Makefile
	vsprojects/Grpc.mak
2015-06-29 08:49:49 -07:00
Craig Tiller acf0f07dfc Unix resolver, bug fixes 2015-06-29 08:24:16 -07:00
Craig Tiller c7b5f7605e Factor out channel state watching 2015-06-27 11:48:42 -07:00
Craig Tiller 0c5cf25d4e Merge github.com:grpc/grpc into tis-but-thy-name 2015-06-26 14:42:54 -07:00
Vijay Pai 8bcba9a08f Merge pull request #2149 from ctiller/oops-i-split-it-again
Initial transport lock split up
2015-06-26 13:58:55 -07:00
Craig Tiller ef2a3e22a1 Merge github.com:grpc/grpc into forever-is-a-long-time 2015-06-26 10:48:17 -07:00
Craig Tiller 052d27b891 Tidy up test to meet our standards 2015-06-26 08:11:34 -07:00
Craig Tiller 30ee10b785 Rename test into the right place 2015-06-26 08:09:01 -07:00
Masood Malekghassemi 1aa041ab1a BLARGHAFLARGHAAHAJHAKJHATJHKAYMNHZIYRN 2015-06-25 18:02:18 -07:00
Craig Tiller 916246625b Introduce connector, to help subchannel connect 2015-06-25 16:31:02 -07:00
Craig Tiller e039f03383 Plumbing transport_op changes through 2015-06-25 12:54:23 -07:00
Craig Tiller 3b1847c528 Merge branch 'oops-i-split-it-again' into tis-but-thy-name 2015-06-25 09:00:34 -07:00
Craig Tiller 4b62811032 Merge github.com:grpc/grpc into tis-but-thy-name 2015-06-25 08:58:23 -07:00
Craig Tiller 6e8c7e87ef Merge github.com:grpc/grpc into oops-i-split-it-again 2015-06-25 08:52:40 -07:00
Craig Tiller f5f1712e1f Refactoring progress towards integrating client configs 2015-06-25 08:47:26 -07:00
Craig Tiller fe8592ee99 Merge github.com:grpc/grpc into are-includes-sane
Conflicts:
	tools/doxygen/Doxyfile.c++.internal
2015-06-25 07:00:18 -07:00
Craig Tiller f75fc12e3a Add a test that headers are properly in build.json
Clean up anything that failed
2015-06-25 06:58:00 -07:00
Craig Tiller 3bc8ebd48e Implementation work for client_config
- uri parsing
- dns resolution
2015-06-24 15:41:15 -07:00
Craig Tiller 7df28a7bd2 Merge github.com:grpc/grpc into that-which-we-call-a-rose
Introduce resolver_factory
2015-06-24 09:23:52 -07:00
Craig Tiller d13794332c Merge github.com:grpc/grpc into oops-i-split-it-again 2015-06-24 08:48:14 -07:00
Craig Tiller 009886cf79 Merge github.com:grpc/grpc into that-which-we-call-a-rose
Conflicts:
	gRPC.podspec
	tools/doxygen/Doxyfile.core.internal
2015-06-23 16:26:18 -07:00
Craig Tiller af69180478 Flesh out things and make them compile 2015-06-23 14:57:07 -07:00
Craig Tiller 31489e3aba Move some code out of src/ into tools/
It shouldn't count towards coverage
2015-06-23 14:27:34 -07:00
yang-g adfed03146 Add missing headers to build.json 2015-06-23 13:01:22 -07:00
Yang Gao 253aaa6b10 Merge pull request #1969 from ctiller/one-shouldnt-depend-on-protobufs
Remove Protobuf dependency for C++
2015-06-23 10:05:20 -07:00
Craig Tiller 949b6ee796 Merge github.com:grpc/grpc into oops-i-split-it-again 2015-06-23 09:26:21 -07:00
Craig Tiller 1a256bd6d8 Merge pull request #2154 from jcanizales/fix-build-json
Add pollset_set.h to build.json
2015-06-22 14:51:47 -07:00
Julien Boeuf 5b1fdc5c3d Merge branch 'master' of https://github.com/grpc/grpc into ssl_auth_context_fix 2015-06-22 16:47:01 +02:00
Jorge Canizales fe8ad73ab7 Add pollset_set.h to build.json 2015-06-20 20:22:51 -07:00
Craig Tiller ab67485ff0 Merge github.com:grpc/grpc into one-shouldnt-depend-on-protobufs 2015-06-19 15:32:52 -07:00
Julien Boeuf 3afa2dc1c1 Merge branch 'master' of https://github.com/grpc/grpc into ssl_auth_context_fix 2015-06-19 13:59:25 +02:00
Craig Tiller 52c6142a30 Merge github.com:grpc/grpc into we-dont-need-no-backup
Conflicts:
	gRPC.podspec
	tools/doxygen/Doxyfile.core.internal
2015-06-18 13:24:15 -07:00
Craig Tiller 8c0c9744bf Merge github.com:grpc/grpc into oops-i-split-it-again 2015-06-18 11:52:29 -07:00
Julien Boeuf a701ade70a Fixing ssl auth context. 2015-06-18 15:23:40 +02:00
murgatroid99 7da8b1a651 Added missing but included headers to build.json 2015-06-17 12:37:34 -07:00
Craig Tiller c851625fa4 Merge branch 'we-dont-need-no-backup' into oops-i-split-it-again 2015-06-17 10:12:42 -07:00
Craig Tiller bf8ac3f406 Merge branch 'you-complete-me' into we-dont-need-no-backup 2015-06-17 09:15:48 -07:00
Craig Tiller 2622ddbcfd Merge branch 'we-dont-need-no-backup' into one-shouldnt-depend-on-protobufs
Conflicts:
	include/grpc++/async_unary_call.h
	include/grpc++/config.h
	include/grpc++/config_protobuf.h
	include/grpc++/impl/service_type.h
	include/grpc++/stream.h
	src/cpp/common/call.cc
2015-06-16 17:30:26 -07:00
Craig Tiller ddd389a149 Merge github.com:grpc/grpc into we-dont-need-no-backup 2015-06-16 17:14:43 -07:00
David Garcia Quintas 4d9414064e Merge branch 'master' of github.com:grpc/grpc into flags-abi 2015-06-15 23:53:27 -07:00
Craig Tiller 6459db484a New chttp2 list implementation 2015-06-15 17:11:45 -07:00
Jan Tattermusch 7ed33732bf regenerate Grpc.mak 2015-06-15 16:43:44 -07:00
Craig Tiller 5dc3b30964 Progress on splitting things up 2015-06-15 16:06:50 -07:00
David Garcia Quintas 1d5aca5de0 Added flags support to grpc_op.
Which includes its propagation to grpc_ioreq and validation mechanisms for checking that only known bits are set ot in).
Also added an internal flag (GRPC_WRITE_INTERNAL_COMPRESS) mask for its use in signaling compressed messages.
2015-06-14 14:42:04 -07:00
Craig Tiller d20efd26e3 Progress on splitting things up 2015-06-12 16:17:09 -07:00
Craig Tiller d8df50c44f Make some buckets to pour code into 2015-06-12 07:53:56 -07:00
Craig Tiller 4152706dee Add file to build.json 2015-06-12 07:51:05 -07:00
Craig Tiller 4671122995 Merge branch 'you-complete-me' into we-dont-need-no-backup 2015-06-09 22:59:31 -07:00
Yang Gao 9e640c8064 Remove non-existing file from build.json 2015-06-09 10:25:33 -07:00