Commit Graph

805 Commits

Author SHA1 Message Date
Hongwei Wang ac133bdd39 Merge branch 'master' of https://github.com/grpc/grpc into zookeeper 2015-08-10 18:26:49 -07:00
Yang Gao 801bbeb7b4 Merge pull request #2856 from vjpai/limes
Bounds checking for ops in call batch
2015-08-10 17:37:52 -07:00
yang-g ffc8a6b431 move auth property iterator declaration into auth_context.h 2015-08-10 12:26:39 -07:00
vjpai 9b2c25e806 Bounds checking for ops in call batch 2015-08-07 17:45:16 -07:00
Hongwei Wang ad5c897a94 Merge branch 'master' of https://github.com/grpc/grpc into zookeeper 2015-08-07 17:17:22 -07:00
Craig Tiller 37f24de603 Merge pull request #2777 from jboeuf/server_creds_auth_md_processor
Server creds auth md processor
2015-08-07 10:17:03 -07:00
yang-g 87e133e13a merge with head 2015-08-06 22:51:27 -07:00
yang-g c8abca8f53 Resolve comments 2015-08-06 22:50:16 -07:00
Julien Boeuf f3128e6ef3 Merge branch 'master' of https://github.com/grpc/grpc into server_creds_auth_md_processor 2015-08-06 15:29:45 -07:00
Craig Tiller 8e5de39fb9 Document finish 2015-08-06 13:50:08 -07:00
Hongwei Wang a83d1b324a Merge branch 'master' of https://github.com/grpc/grpc into zookeeper 2015-08-06 12:52:18 -07:00
Yang Gao aa7a75a4d9 Merge pull request #2813 from ctiller/every-day-i-propagate
C++ propagation API
2015-08-06 09:40:04 -07:00
Yang Gao e5b0459299 Merge pull request #2750 from ctiller/propagate
Core-supported context propagation
2015-08-06 09:39:51 -07:00
Craig Tiller 44912d78a0 Explicitly spell out cancellation in default propagation mask 2015-08-06 09:38:21 -07:00
Julien Boeuf d3368e4192 Merge branch 'master' of github.com:grpc/grpc into server_creds_auth_md_processor 2015-08-05 21:29:42 -07:00
Julien Boeuf 77a7b870c3 Fixing API (thanks Craig for the comments) and associated tests. 2015-08-05 20:11:02 -07:00
Craig Tiller 2c3be1df4f Add tests for C++ propagation 2015-08-05 15:59:27 -07:00
yang-g 8708dd76c1 Add WaitForState 2015-08-05 15:57:14 -07:00
Abhishek Kumar 98049242b7 Merge pull request #2781 from yang-g/stuboptions
Add StubOptions
2015-08-05 15:55:19 -07:00
Craig Tiller e40f964e55 Merge branch 'propagate' into every-day-i-propagate 2015-08-05 15:32:23 -07:00
Craig Tiller fdbd728a82 Rename constants 2015-08-05 15:24:26 -07:00
Craig Tiller bb5361453f C++ context propagation 2015-08-05 15:18:19 -07:00
yang-g a73dc1c708 specialize deadline type and implementation 2015-08-05 14:24:00 -07:00
yang-g c0f3279175 remove new state ptr 2015-08-05 13:27:46 -07:00
yang-g 88d772c5b8 sync api needs last_observed state too 2015-08-05 13:23:38 -07:00
yang-g 1ae0afccb5 api 2015-08-05 13:20:33 -07:00
Hongwei Wang bc7405c320 Merge branch 'master' of https://github.com/grpc/grpc into zookeeper 2015-08-05 12:46:17 -07:00
Craig Tiller 22de7b65c0 Merge github.com:grpc/grpc into propagate 2015-08-05 12:13:15 -07:00
Vijay Pai 8158c6c309 Merge pull request #2713 from ctiller/plucking-hell
Allow specific pollers to be woken
2015-08-05 11:29:31 -07:00
Hongwei Wang 4346e53be6 Merge branch 'master' of https://github.com/grpc/grpc into zookeeper 2015-08-05 11:21:15 -07:00
Craig Tiller a600d58551 Merge github.com:grpc/grpc into propagate 2015-08-05 10:44:45 -07:00
Craig Tiller 402acf6c44 Fix proxy, finalize API 2015-08-05 10:43:10 -07:00
Abhishek Kumar 183c9f77a7 Merge pull request #2767 from ctiller/no-poop-on-pizza
Rename grpc_server_add_http2_port to grpc_server_add_insecure_http2_port
2015-08-05 10:25:35 -07:00
Craig Tiller 18541a1cee Merge github.com:grpc/grpc into propagate 2015-08-05 08:10:22 -07:00
yang-g d45a26ed06 allow null tag 2015-08-04 16:36:22 -07:00
yang-g b335256444 Add AsyncNotifyWhenDone 2015-08-04 14:42:06 -07:00
Craig Tiller a9c643fc60 Merge github.com:grpc/grpc into plucking-hell 2015-08-04 08:23:32 -07:00
Craig Tiller 17effabe42 Add proxy tests to end2end suite
Currently the oauth2 variant of these tests is disabled. Will work with
@jboeuf to figure out how to turn them on.
2015-08-04 08:19:36 -07:00
yang-g 297a25b0cf Add StubOptions 2015-08-03 16:43:46 -07:00
Julien Boeuf 324b4b1d00 Merge branch 'auth_md_processor' into server_creds_auth_md_processor 2015-08-03 16:35:44 -07:00
Julien Boeuf 095f4f9559 Merge branch 'master' of github.com:grpc/grpc into auth_md_processor 2015-08-03 15:44:09 -07:00
Hongwei Wang 72538b9103 Merge branch 'master' of https://github.com/grpc/grpc into zookeeper 2015-08-03 12:29:18 -07:00
Vijay Pai 0a9ca86c35 Merge pull request #2702 from yang-g/peeraddr
Add accessor peer() in ClientContext and ServerContext
2015-08-03 10:43:24 -07:00
Craig Tiller c5ae3eb8d6 Rename grpc_server_add_http2_port to grpc_server_add_insecure_http2_port 2015-08-03 10:42:22 -07:00
Michael Lumish 3d382a0da1 Merge pull request #2751 from ctiller/alphanumeric-juju-fish
Remove optional parameter from watch connectivity state
2015-08-03 08:41:05 -07:00
Craig Tiller c7df0df618 Implement cancellation propagation, define auth propagation 2015-08-03 08:06:50 -07:00
Craig Tiller 489df079ae Formalize max pluckers 2015-08-01 16:21:37 -07:00
Craig Tiller 6728bef3b1 Merge branch 'propagate' of github.com:ctiller/grpc into propagate
Conflicts:
	src/core/surface/channel.c
2015-08-01 16:12:04 -07:00
Craig Tiller fa44f18516 Merge github.com:grpc/grpc into propagate
Conflicts:
	src/core/surface/channel.c
2015-08-01 16:11:03 -07:00
Yang Gao 7716c53a21 Merge pull request #2717 from ctiller/yeah-we-know-what-youre-talking-about
Make call_create with host=NULL provide a default host name
2015-07-31 21:34:38 -07:00