ca452f432e
Merge pull request #9648 from dgquintas/lr_sans_md
...
Use call context to propagare LR costs
2017-02-16 12:46:11 -08:00
ccbfb461d0
Merge remote-tracking branch 'upstream/master' into packet-coalescing-core
2017-02-14 09:32:21 -08:00
f31f096274
Use call context to propagare LR costs
2017-02-13 16:26:00 -08:00
2e096b0fec
Merge pull request #9371 from Vizerai/tracing_API
...
Tracing API
2017-02-08 12:16:35 -08:00
012915045f
Secure naming support for gRPCLB
2017-02-07 17:41:57 -08:00
0d2d72f76e
Merge pull request #9596 from muxi/cronet-tests-in-jenkins
...
Add Cronet core tests to Jenkins
2017-02-07 09:53:44 -08:00
938f099100
Add Cronet core tests to Jenkins
2017-02-06 15:55:02 -08:00
ed20a69939
Resolve generate_project failure
2017-02-06 13:42:58 -08:00
7a008c9311
Merge remote-tracking branch 'upstream/master' into automate-objc-version-advancement
2017-02-06 13:40:43 -08:00
d5923578c0
nit fixes
2017-02-06 11:25:59 -08:00
c4fc1da989
Merge pull request #9534 from muxi/port-9505
...
Port #9505 : Fixes for gRPC ObjC v1.1.0 release
2017-02-06 10:27:05 -08:00
2688eb143e
Merge remote-tracking branch 'upstream/master' into packet-coalescing-core
2017-02-01 15:23:41 -08:00
0a2fae9aed
Dynamically enable packet coalescing by channel args
2017-02-01 15:04:16 -08:00
f0a1269673
Accomodate changes in #9532
2017-01-31 16:36:56 -08:00
e2de92fa6c
port #9505 to master
2017-01-31 16:34:31 -08:00
27e9db4393
Add modification warning to templated files
2017-01-30 09:22:30 -08:00
95ccbc2d6f
Merge branch 'bm_countwrites' into bwest
2017-01-27 14:10:09 -08:00
29053ec89c
Merge branch 'master' of https://github.com/Vizerai/grpc into tracing_API
2017-01-27 13:11:12 -08:00
690aee6d30
Automatedly advance ObjC version numbers
2017-01-27 04:18:26 +00:00
48af8b2721
Merge github.com:grpc/grpc into bwest
2017-01-26 13:58:52 -08:00
e0cd44aa01
Merge branch 'master' of https://github.com/Vizerai/grpc into tracing_API
2017-01-26 13:26:30 -08:00
c63aaf1650
Merge branch 'cp' into rollfwd
2017-01-26 08:51:30 -08:00
6f690f3483
Merge pull request #9372 from markdroth/proxy_mapper
...
Add proxy mapper hook.
2017-01-25 10:42:34 -08:00
7c70b6c144
Revert "Revert "Metadata handling rewrite""
...
This reverts commit 5e01e2ac97
2017-01-23 07:48:42 -08:00
5e01e2ac97
Revert "Metadata handling rewrite"
2017-01-20 18:11:52 -08:00
0e5b67f4a2
update
2017-01-20 14:02:18 -08:00
ff1f160a26
Merge github.com:grpc/grpc into bwest
2017-01-20 13:55:35 -08:00
d58a985a56
Move detection of HTTP CONNECT proxy from DNS resolver to client channel.
2017-01-18 08:28:57 -08:00
5acc826ace
Merge github.com:grpc/grpc into metadata_filter
2017-01-17 17:20:14 -08:00
79f2a24644
Add proxy mapper hook.
2017-01-17 14:13:33 -08:00
e6bcd0ebc9
Merge remote-tracking branch 'upstream/master' into revert-9063-revert-8951-revert-8949-revert-8922-slice_cleanup
2017-01-13 11:23:01 -08:00
d425712427
Merge github.com:grpc/grpc into bwest
2017-01-13 09:33:57 -08:00
2d9f8e8179
Fix build
2017-01-10 08:48:48 -08:00
d04dc4da81
Merge github.com:grpc/grpc into fix_errors
2017-01-09 14:40:28 -08:00
732351f826
Start fixing http error --> grpc status conversion
2017-01-06 14:52:01 -08:00
1f0f23cc5a
Handshaker plugin mechanism.
2017-01-06 13:07:19 -08:00
348fba2809
Merge remote-tracking branch 'upstream/master' into revert-9063-revert-8951-revert-8949-revert-8922-slice_cleanup
2017-01-06 11:07:30 -08:00
293ef1572b
Merge github.com:grpc/grpc into slice_with_exec_ctx
2017-01-04 15:38:44 -08:00
3ca6019d39
Merge branch 'patchy' into slice_with_exec_ctx_and_build
2017-01-04 14:41:29 -08:00
3d5592cea8
Moving message_size_filter properly.
2017-01-04 23:23:40 +01:00
eb30c809cf
Merge branch 'flow_control_v2' into bwest
2016-12-27 16:03:43 -08:00
ef6938477b
Merge branch 'slice_with_exec_ctx' into metadata_filter
2016-12-27 08:59:00 -08:00
0704727c2d
Merge github.com:grpc/grpc into slice_with_exec_ctx
2016-12-27 08:38:35 -08:00
8f7b0b48bf
v1.0.x → master upmerge
...
Manual changes:
- Fixed use of Exception.message in _invalid_metadata_test.py
- Fixed merge of one_failed_as_unavailable in rpc_server_spec.rb
- Added "set -e" to generate_build_additions.sh
2016-12-16 23:48:52 +00:00
1b0d2f008b
Merge branch 'slice_with_exec_ctx' into metadata_filter
2016-12-12 07:19:55 -08:00
6d379a90af
Merge github.com:grpc/grpc into slice_with_exec_ctx
2016-12-12 07:16:03 -08:00
4d2ea02129
Revert "Revert "Revert "Revert "Remove redundant includes from string.h and tmpfile.h""""
2016-12-12 07:12:27 -08:00
30268a99e0
Revert "Revert "Revert "Remove redundant includes from string.h and tmpfile.h"""
2016-12-12 06:48:30 -08:00
b995e8bcda
Merge github.com:grpc/grpc into slice_with_exec_ctx
2016-12-12 06:36:43 -08:00
385dd9a462
Merge branch 'slice_interning' into metadata_filter
2016-12-06 20:27:38 -08:00
David G. Quintas