Craig Tiller
eda29c6398
Merge branch 'epex4' into uberpoll
2017-05-05 15:21:19 +00:00
Craig Tiller
7365ec95e4
Merge branch 'timer_pool' into uberpoll
2017-05-05 15:21:09 +00:00
Sree Kuchibhotla
1440b0654d
Merge branch 'master' into epoll_thread_pool
2017-05-03 15:42:42 -07:00
Craig Tiller
4d03ffbdc6
Merge github.com:grpc/grpc into timer_pool
2017-05-03 07:57:53 -07:00
Craig Tiller
0bc3b40b76
Merge github.com:grpc/grpc into hiertune
2017-05-03 07:35:51 -07:00
Sree Kuchibhotla
d4fc32eacd
New epoll-based polling engine with dedicated poller threads
2017-05-02 15:32:22 -07:00
Craig Tiller
c3571791a5
Isolate timer checking in its own thread
2017-05-02 14:36:33 -07:00
Mark D. Roth
09e458c6cd
Implement client-side load reporting for grpclb.
2017-05-02 08:13:26 -07:00
Craig Tiller
c610985aeb
Merge branch 'hiertune' into epex4+epoll1
2017-05-01 14:26:49 -07:00
Muxi Yan
e123a05913
Merge remote-tracking branch 'upstream/master' into backward-compat
2017-04-30 21:16:07 -07:00
Vizerai
0359e1260f
initial commit
2017-04-28 20:06:58 -07:00
Craig Tiller
ebf3a89984
Merge github.com:grpc/grpc into epoll1+hierarchical-turnstile
2017-04-28 09:27:01 -07:00
Muxi Yan
f63afec89d
user-agent string filtering
2017-04-27 11:14:18 -07:00
David G. Quintas
8c71bde9b0
Merge pull request #10522 from jiangtaoli2016/new_tsi
...
Update TSI with new non-blocking TSI interfaces.
2017-04-27 10:42:33 -07:00
Craig Tiller
c67cc999e3
Initial fork for singleton epoll poller
2017-04-27 10:15:51 -07:00
Craig Tiller
ac99bfff46
Merge github.com:grpc/grpc into epex4
2017-04-27 09:27:20 -07:00
Muxi Yan
b53fd4df37
Add cronet_compression workaround filter
2017-04-25 17:04:29 -07:00
Craig Tiller
819cd88bd7
Allow EPOLLEXCLUSIVE tests to be omitted outside of CI
2017-04-25 13:18:22 -07:00
Craig Tiller
26ec8fba7a
Merge github.com:grpc/grpc into epex4
2017-04-17 08:38:33 -07:00
jiangtaoli2016
e223a6a042
Merge branch 'master' into new_tsi
2017-04-15 10:20:51 -07:00
Craig Tiller
56c23f11b0
Merge github.com:grpc/grpc into c++lame
2017-04-14 15:18:20 -07:00
Craig Tiller
58e6d13f1b
Merge github.com:grpc/grpc into minimal_test
2017-04-13 20:50:09 -07:00
David Garcia Quintas
9e1acc0796
master to 1.4.0-dev
2017-04-13 16:30:15 -07:00
Craig Tiller
cacaa1950d
Merge github.com:grpc/grpc into epex3
2017-04-13 15:22:38 +00:00
Craig Tiller
80233bfde5
Merge github.com:grpc/grpc into minimal_test
2017-04-12 14:55:17 -07:00
Craig Tiller
4d780a52b8
stuff
2017-04-12 13:47:18 -07:00
Craig Tiller
f0721657ff
Merge github.com:grpc/grpc into truebin
2017-04-12 08:41:29 -07:00
Craig Tiller
acce275281
Merge github.com:grpc/grpc into c++lame
2017-04-11 10:46:35 -07:00
jiangtaoli2016
70928f0722
Merge branch 'master' into new_tsi
2017-04-11 10:07:01 -07:00
Craig Tiller
440df1048a
Merge github.com:grpc/grpc into minimal_test
2017-04-11 09:55:16 -07:00
jiangtaoli2016
e69881de7f
Revise based on Mark's comments.
2017-04-10 14:45:23 -07:00
Craig Tiller
eb36437e85
Merge github.com:grpc/grpc into c++lame
2017-04-07 17:08:42 -07:00
Craig Tiller
8ebb5443de
Update build.yaml
2017-04-07 16:01:55 -07:00
Craig Tiller
f4360d77d4
Fix build, fix epollex detection
2017-04-07 08:51:00 -07:00
Craig Tiller
71d6ce65d4
Merge deadline_init/deadline_start
2017-04-06 09:10:09 -07:00
Craig Tiller
a24b971214
Rename compress_filter --> message_compress_filter
2017-04-06 09:03:21 -07:00
Craig Tiller
376887d213
Split event notification out of ev_epoll_linux.c
2017-04-06 08:27:03 -07:00
Craig Tiller
ee787caf0e
Merge github.com:grpc/grpc into truebin
2017-04-04 15:54:40 -07:00
Craig Tiller
c8f62bcb03
Add new setting for true-binary mode
2017-04-03 16:25:45 -07:00
Craig Tiller
3be7dd0e79
Optionalize deadline checking
2017-04-03 14:30:03 -07:00
Craig Tiller
af76743e33
Optionalize compress, gather all the http2 filter bits together in ext/
2017-04-03 13:54:31 -07:00
Craig Tiller
9b3648a28e
Optionalize message_size_filter
2017-04-03 12:25:19 -07:00
Craig Tiller
6d4894e9d6
optionalize max_age
2017-03-31 17:22:06 -07:00
Craig Tiller
9eb0fdec00
Reorganize ext tree
...
- filters live under filters
- lb_policy, resolver implementations (being part of client_channel) live under client_channel
2017-03-31 16:59:30 -07:00
Craig Tiller
9c54a0c12c
Merge pull request #10382 from ctiller/checks
...
Reinstate filegroup dependency checks, fix fallout
2017-03-31 16:10:35 -07:00
Craig Tiller
b3d70102a5
Memory allocator for C++ in core
2017-03-31 14:17:09 -07:00
Yuchen Zeng
6715a15fe1
Merge pull request #10318 from y-zeng/server_channel_max_age
...
Max age for server channels
2017-03-31 10:59:04 -07:00
Craig Tiller
790f6afebd
Regenerate projects
2017-03-30 12:39:24 -07:00
Craig Tiller
29b527fa30
Reinstate one check, fix fall out
2017-03-30 10:27:20 -07:00
Craig Tiller
134fed3a85
Move src/core/lib/tsi --> src/core/tsi
2017-03-28 14:27:18 -07:00
Yuchen Zeng
a809ea5c14
Add max_age_filter
2017-03-28 02:11:49 -07:00
makdharma
c4478a103b
Merge pull request #10222 from makdharma/caching_with_uri
...
using URI query to communicate payload
2017-03-26 21:05:20 -07:00
Yuchen Zeng
f466ae116e
Merge pull request #7771 from y-zeng/cares_buildin
...
Async DNS resolver with pre-configured c-ares
2017-03-24 14:52:04 -07:00
Sree Kuchibhotla
b6512cf940
Merge pull request #10245 from sreecha/cq_factory_api
...
Introduce grpc_completion_queue_factory API
2017-03-24 13:23:44 -07:00
Makarand Dharmapurikar
a128b7a8a5
Merge branch 'master' of https://github.com/grpc/grpc into caching_with_uri
2017-03-24 11:12:20 -07:00
Nicolas Noble
af61d0b7b4
Merge pull request #10293 from nicolasnoble/upmerge-1.2.0
...
Upmerge from 1.2.0
2017-03-24 10:06:43 -07:00
Michael Warres
c46b3ebeb9
Add socket factory support to udp_server.c
2017-03-24 11:33:20 -04:00
Nicolas "Pixel" Noble
e44a50ffd7
Merge branch 'v1.2.x' of https://github.com/grpc/grpc into upmerge-1.2.0
2017-03-24 00:54:47 +01:00
Yuchen Zeng
937302b0df
Merge remote-tracking branch 'upstream/master' into cares_rebase
2017-03-22 10:54:31 -07:00
Makarand Dharmapurikar
226098c9f1
added b64.c to the sources neede for grpc_base
2017-03-22 10:53:37 -07:00
Mark D. Roth
5c42af696d
Merge pull request #9655 from markdroth/remove_initial_connect_string
...
Remove initial_connect_string hack.
2017-03-22 08:14:06 -07:00
Sree Kuchibhotla
098110d882
Merge branch 'master' into cq_factory_api
2017-03-21 16:39:11 -07:00
Sree Kuchibhotla
bf18428740
Introduce grpc_completion_queue_factory API
...
Just the API and a bare-bone implementation
2017-03-21 15:18:58 -07:00
Mark D. Roth
62d1dd920e
Merge pull request #9850 from markdroth/retry_throttle
...
Retry throttling implementation.
2017-03-21 13:40:20 -07:00
Mark D. Roth
14ef5d83e2
Merge remote-tracking branch 'upstream/master' into remove_initial_connect_string
2017-03-21 13:08:53 -07:00
Alexander Polcyn
3e30832cca
bump v1.2.x branch to 1.2.1-pre1
2017-03-20 17:00:45 -07:00
David Garcia Quintas
69e5a28635
Going for 1.2.0
2017-03-20 12:51:17 -07:00
Yuchen Zeng
9bc0d8200e
Merge remote-tracking branch 'upstream/master' into cares_bazel_rule
2017-03-17 16:00:17 -07:00
Yuchen Zeng
2c977084c8
Merge remote-tracking branch 'upstream/master' into cares_bazel_rule
2017-03-17 15:57:23 -07:00
Yuchen Zeng
d9efa4a5fd
Merge pull request #10123 from y-zeng/android
...
Fix android build
2017-03-17 11:04:49 -07:00
Mark D. Roth
f3792b2024
Merge remote-tracking branch 'upstream/master' into remove_initial_connect_string
2017-03-17 11:04:09 -07:00
Mark D. Roth
693d2b48ab
Merge remote-tracking branch 'upstream/master' into retry_throttle
2017-03-17 09:53:35 -07:00
Mark D. Roth
fecba535d9
Switch to using a CAS loop to update the token value.
2017-03-17 09:50:48 -07:00
Muxi Yan
021fa52582
Merge pull request #10157 from muxi/advance-protoc-version
...
Advance ProtoCompiler version and fix podspecs
2017-03-17 01:03:54 -07:00
Muxi Yan
e38b01293b
Changes to podspecs
2017-03-16 20:53:41 -07:00
Muxi Yan
37d3fba391
Relieve ios deployment version to 7.0
2017-03-16 19:33:53 -07:00
Ken Payson
12ca7d319c
Bump 1.2.x version to pre-2
2017-03-16 11:01:06 -07:00
Mark D. Roth
3a91707ace
Merge remote-tracking branch 'upstream/master' into retry_throttle
2017-03-15 08:06:21 -07:00
Yuchen Zeng
68745bbf8a
Resolve dependency issues
2017-03-14 18:00:48 -07:00
Yuchen Zeng
47155ed254
Split ifaddr related functions out into a separate file
2017-03-13 17:18:07 -07:00
Craig Tiller
9202b3fdfd
Arena allocator for grpc
2017-03-12 22:30:38 -07:00
David Garcia Quintas
904e7f53ae
Introducing 1.2.0-pre1
2017-03-09 15:02:19 -08:00
David Garcia Quintas
74cec10619
Bumped version to 1.3.0-dev
2017-03-09 15:00:26 -08:00
Craig Tiller
fbedd676f7
Merge pull request #9769 from ctiller/always-use-port-server
...
Always use port server
2017-03-01 15:11:37 -08:00
Mark D. Roth
02612c163e
Merge remote-tracking branch 'upstream/master' into retry_throttle
2017-03-01 10:58:13 -08:00
Craig Tiller
46ab5f5983
Update template
2017-02-28 08:40:19 -08:00
Craig Tiller
edbf2b9d13
Add a spinlock type.
...
Useful for situations where we need to repeatedly trylock, not useful
for cases where we need to lock (due to spinning).
Add a variant of sync_test to test it (with the same tests we run for
gpr_mu).
Add a benchmark to bm_closure to demonstrate single threaded performance.
2017-02-27 07:24:00 -08:00
Mark D. Roth
d6d192d005
Retry throttling implementation.
2017-02-23 08:58:42 -08:00
David G. Quintas
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
Muxi Yan
ccbfb461d0
Merge remote-tracking branch 'upstream/master' into packet-coalescing-core
2017-02-14 09:32:21 -08:00
David Garcia Quintas
f31f096274
Use call context to propagare LR costs
2017-02-13 16:26:00 -08:00
Mark D. Roth
1dcd922ce6
Remove initial_connect_string hack.
2017-02-09 09:40:07 -08:00
Yuchen Zeng
f44e781d01
Merge remote-tracking branch 'upstream/master' into cares_bazel_rule
2017-02-08 20:15:20 -08:00
Jim King
2e096b0fec
Merge pull request #9371 from Vizerai/tracing_API
...
Tracing API
2017-02-08 12:16:35 -08:00
David Garcia Quintas
012915045f
Secure naming support for gRPCLB
2017-02-07 17:41:57 -08:00
Muxi Yan
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
Muxi Yan
938f099100
Add Cronet core tests to Jenkins
2017-02-06 15:55:02 -08:00
Muxi Yan
ed20a69939
Resolve generate_project failure
2017-02-06 13:42:58 -08:00
Muxi Yan
7a008c9311
Merge remote-tracking branch 'upstream/master' into automate-objc-version-advancement
2017-02-06 13:40:43 -08:00
Muxi Yan
d5923578c0
nit fixes
2017-02-06 11:25:59 -08:00
Muxi Yan
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
Muxi Yan
2688eb143e
Merge remote-tracking branch 'upstream/master' into packet-coalescing-core
2017-02-01 15:23:41 -08:00
Muxi Yan
0a2fae9aed
Dynamically enable packet coalescing by channel args
2017-02-01 15:04:16 -08:00
Muxi Yan
f0a1269673
Accomodate changes in #9532
2017-01-31 16:36:56 -08:00
Muxi Yan
e2de92fa6c
port #9505 to master
2017-01-31 16:34:31 -08:00
Yuchen Zeng
92edda5129
Merge remote-tracking branch 'upstream/master' into cares_bazel_rule
2017-01-31 15:59:19 -08:00
Muxi Yan
27e9db4393
Add modification warning to templated files
2017-01-30 09:22:30 -08:00
Craig Tiller
95ccbc2d6f
Merge branch 'bm_countwrites' into bwest
2017-01-27 14:10:09 -08:00
Vizerai
29053ec89c
Merge branch 'master' of https://github.com/Vizerai/grpc into tracing_API
2017-01-27 13:11:12 -08:00
Muxi Yan
690aee6d30
Automatedly advance ObjC version numbers
2017-01-27 04:18:26 +00:00
Craig Tiller
48af8b2721
Merge github.com:grpc/grpc into bwest
2017-01-26 13:58:52 -08:00
Vizerai
e0cd44aa01
Merge branch 'master' of https://github.com/Vizerai/grpc into tracing_API
2017-01-26 13:26:30 -08:00
Craig Tiller
c63aaf1650
Merge branch 'cp' into rollfwd
2017-01-26 08:51:30 -08:00
Yuchen Zeng
bc8a70445d
Merge remote-tracking branch 'upstream/master' into cares_bazel_rule
2017-01-25 16:10:18 -08:00
Mark D. Roth
6f690f3483
Merge pull request #9372 from markdroth/proxy_mapper
...
Add proxy mapper hook.
2017-01-25 10:42:34 -08:00
Yuchen Zeng
d32dc3a188
Remove fallback files
2017-01-23 18:31:51 -08:00
Craig Tiller
7c70b6c144
Revert "Revert "Metadata handling rewrite""
...
This reverts commit 5e01e2ac97 .
2017-01-23 07:48:42 -08:00
Craig Tiller
5e01e2ac97
Revert "Metadata handling rewrite"
2017-01-20 18:11:52 -08:00
Vizerai
0e5b67f4a2
update
2017-01-20 14:02:18 -08:00
Craig Tiller
ff1f160a26
Merge github.com:grpc/grpc into bwest
2017-01-20 13:55:35 -08:00
Yuchen Zeng
04ec4701e3
Merge remote-tracking branch 'upstream/master' into cares_buildin
2017-01-18 18:49:07 -08:00
Mark D. Roth
d58a985a56
Move detection of HTTP CONNECT proxy from DNS resolver to client channel.
2017-01-18 08:28:57 -08:00
Craig Tiller
5acc826ace
Merge github.com:grpc/grpc into metadata_filter
2017-01-17 17:20:14 -08:00
Mark D. Roth
79f2a24644
Add proxy mapper hook.
2017-01-17 14:13:33 -08:00
Mark D. Roth
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
Craig Tiller
d425712427
Merge github.com:grpc/grpc into bwest
2017-01-13 09:33:57 -08:00
Craig Tiller
2d9f8e8179
Fix build
2017-01-10 08:48:48 -08:00
Craig Tiller
d04dc4da81
Merge github.com:grpc/grpc into fix_errors
2017-01-09 14:40:28 -08:00
Craig Tiller
732351f826
Start fixing http error --> grpc status conversion
2017-01-06 14:52:01 -08:00
Mark D. Roth
1f0f23cc5a
Handshaker plugin mechanism.
2017-01-06 13:07:19 -08:00
Mark D. Roth
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
Craig Tiller
293ef1572b
Merge github.com:grpc/grpc into slice_with_exec_ctx
2017-01-04 15:38:44 -08:00
Craig Tiller
3ca6019d39
Merge branch 'patchy' into slice_with_exec_ctx_and_build
2017-01-04 14:41:29 -08:00
Nicolas "Pixel" Noble
3d5592cea8
Moving message_size_filter properly.
2017-01-04 23:23:40 +01:00
Craig Tiller
eb30c809cf
Merge branch 'flow_control_v2' into bwest
2016-12-27 16:03:43 -08:00
Craig Tiller
ef6938477b
Merge branch 'slice_with_exec_ctx' into metadata_filter
2016-12-27 08:59:00 -08:00
Craig Tiller
0704727c2d
Merge github.com:grpc/grpc into slice_with_exec_ctx
2016-12-27 08:38:35 -08:00
Nathaniel Manista
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
Craig Tiller
1b0d2f008b
Merge branch 'slice_with_exec_ctx' into metadata_filter
2016-12-12 07:19:55 -08:00
Craig Tiller
6d379a90af
Merge github.com:grpc/grpc into slice_with_exec_ctx
2016-12-12 07:16:03 -08:00
Mark D. Roth
4d2ea02129
Revert "Revert "Revert "Revert "Remove redundant includes from string.h and tmpfile.h""""
2016-12-12 07:12:27 -08:00
Craig Tiller
30268a99e0
Revert "Revert "Revert "Remove redundant includes from string.h and tmpfile.h"""
2016-12-12 06:48:30 -08:00
Craig Tiller
b995e8bcda
Merge github.com:grpc/grpc into slice_with_exec_ctx
2016-12-12 06:36:43 -08:00
Craig Tiller
385dd9a462
Merge branch 'slice_interning' into metadata_filter
2016-12-06 20:27:38 -08:00
Craig Tiller
35769dc29c
Merge branch 'slice_with_exec_ctx' into slice_interning
2016-12-06 20:23:13 -08:00
Craig Tiller
30d50fed6d
Fix build
2016-12-06 19:34:32 -08:00
Craig Tiller
397bff36b9
Merge github.com:grpc/grpc into slice_with_exec_ctx
2016-12-06 15:05:59 -08:00
Mark D. Roth
2d317fbc57
Revert "Revert "Remove redundant includes from string.h and tmpfile.h""
2016-12-05 08:07:13 -08:00
Mark D. Roth
4eec0041f5
Revert "Remove redundant includes from string.h and tmpfile.h"
2016-12-05 08:03:41 -08:00
Mark D. Roth
adc3fbc0a3
Merge pull request #8922 from sreecha/slice_cleanup
...
Remove redundant includes from string.h and tmpfile.h
2016-12-05 07:43:40 -08:00
Mark D. Roth
714038204a
Use the same server code for both secure and insecure servers.
2016-12-02 10:51:39 -08:00
Sree Kuchibhotla
f989469fe3
Temporarily enable gpr_slice_* functions to not break api compatibility
2016-12-01 17:09:35 -08:00
Yuchen Zeng
b0023d25dc
Merge remote-tracking branch 'upstream/master' into cares_buildin
2016-11-30 15:51:25 -08:00
Craig Tiller
369ddc524a
Merge branch 'slice_with_exec_ctx' into slice_interning
2016-11-30 13:32:18 -08:00
Mark D. Roth
6c3d040ebf
Merge branch 'security_handshaker1' into security_handshaker2
2016-11-29 14:24:42 -08:00
Muxi Yan
a7f03f6423
Advance objective c version to v1.0.2
2016-11-28 11:29:19 -08:00
Craig Tiller
ac5f518016
Merge branch 'slice_with_exec_ctx' into eliminate_mdstr
2016-11-18 12:45:16 -08:00
Craig Tiller
b28c7e8710
Merge github.com:grpc/grpc into slice_with_exec_ctx
2016-11-18 10:29:04 -08:00
Yuchen Zeng
9e4c8eb8e8
Address review comments
2016-11-18 01:17:10 -08:00
Mark D. Roth
071cacf1cb
Rename security handshaker files.
2016-11-17 13:17:56 -08:00
Mark D. Roth
8686cab11c
Use the same connector code for both secure and insecure clients.
2016-11-17 13:12:17 -08:00
Craig Tiller
66b14c125e
Merge branch 'slice_interning' into eliminate_mdstr
2016-11-16 16:05:01 -08:00
Craig Tiller
1094c32f35
Merge branch 'slice_with_exec_ctx' into slice_interning
2016-11-16 15:54:03 -08:00
Craig Tiller
c586666cbd
Merge github.com:grpc/grpc into slice_with_exec_ctx
2016-11-16 15:25:00 -08:00
Mark D. Roth
863113a0d9
Merge remote-tracking branch 'upstream/master' into service_config_json
2016-11-16 14:18:28 -08:00
Craig Tiller
c80fa2f673
Merge pull request #8680 from ctiller/no_more_legacy
...
Remove legacy poller
2016-11-15 17:25:27 -08:00
Yuchen Zeng
5c1f55af23
Merge pull request #8335 from y-zeng/tos
...
Add grpc_socket_mutator
2016-11-11 15:05:14 -08:00
Craig Tiller
5ef31ab9c9
Progress towards mdstr elimination
2016-11-10 16:27:48 -08:00
Craig Tiller
14ded3bbff
Merge branch 'slice_with_exec_ctx' into slice_interning
2016-11-10 08:37:40 -08:00
Craig Tiller
7cdad96fc4
Fix foward declaration duplication
2016-11-10 08:37:21 -08:00
Craig Tiller
64b26567ad
First pass of slice interning facilities
2016-11-10 08:31:42 -08:00
Mark D. Roth
c56c3ad259
Merge remote-tracking branch 'upstream/master' into service_config_json
2016-11-09 13:32:36 -08:00
Muxi Yan
53c4c28b43
Add new util file to podspec
2016-11-08 13:34:02 -08:00
Mark D. Roth
fc75321830
Merge remote-tracking branch 'upstream/master' into service_config_json
2016-11-08 10:57:20 -08:00
Yuchen Zeng
bd363544fd
Merge remote-tracking branch 'upstream/master' into cares_buildin
2016-11-08 10:56:16 -08:00
Craig Tiller
e6684f415e
Remove legacy poller
2016-11-08 08:17:43 -08:00
Craig Tiller
b720b609ea
Merge github.com:grpc/grpc into grpc_slice
2016-11-08 07:20:27 -08:00
Mark D. Roth
c22717ec63
Merge remote-tracking branch 'upstream/master' into service_config_json
2016-11-07 09:41:07 -08:00
Craig Tiller
503653e27e
Merge pull request #8456 from ctiller/pid_ctl
...
Simple PID controller
2016-11-04 14:17:14 -07:00
Mark D. Roth
ea846a0800
Rename method_config.[ch] to service_config.[ch].
2016-11-03 11:32:54 -07:00
Yuchen Zeng
e882e39224
Fix windows build
2016-11-02 19:33:41 -07:00
Yuchen Zeng
64d518e3b0
Merge remote-tracking branch 'upstream/master' into tos
2016-11-02 16:27:49 -07:00
Craig Tiller
41fd9f2343
Merge github.com:grpc/grpc into grpc_slice
2016-10-31 14:42:53 -07:00
Yuchen Zeng
c76e9d3062
Merge remote-tracking branch 'upstream/master' into cares_buildin
2016-10-28 15:41:58 -07:00
Michael Lumish
15b04e41f1
Merge pull request #8559 from murgatroid99/v1.0.1_upmerge
...
V1.0.1 upmerge
2016-10-28 14:22:09 -07:00
murgatroid99
5d6ae930ab
Merge remote-tracking branch 'upstream/v1.0.x' into v1.0.1_upmerge
2016-10-28 11:48:22 -07:00
Craig Tiller
fa014a86e3
Merge github.com:grpc/grpc into pid_ctl
2016-10-28 07:31:20 -07:00
Craig Tiller
6e080a3651
Merge branch 'buffer_pools_for_realsies' into grpc_slice
2016-10-26 21:00:53 -07:00
Craig Tiller
3d357d901c
Merge github.com:grpc/grpc into buffer_pools_for_realsies
2016-10-26 20:52:03 -07:00
Craig Tiller
c3350541e3
Generate build files
2016-10-26 16:19:01 -07:00
Mark D. Roth
e4e457ed76
Merge remote-tracking branch 'upstream/master' into circular_dependency_fix
2016-10-26 13:06:03 -07:00
Mark D. Roth
bfe56801ad
Move method_config module from ext/client_channel to lib/transport.
2016-10-26 12:45:20 -07:00
Mark D. Roth
fb809b7850
Merge remote-tracking branch 'upstream/master' into resolver_channel_args
2016-10-26 09:12:25 -07:00
Muxi Yan
447d0a22e6
Advance versions of gRPC from v1.0.1-pre1 to v1.0.1
2016-10-25 14:14:12 -07:00
Yuchen Zeng
f1cd449030
Merge remote-tracking branch 'upstream/master' into cares_buildin
2016-10-25 11:26:17 -07:00
Craig Tiller
c690768b15
Merge branch 'flow_control_v2' into bwest
2016-10-24 14:50:12 -07:00
Craig Tiller
fe8c5012d3
Merge github.com:grpc/grpc into buffer_pools_for_realsies
2016-10-24 14:49:18 -07:00
murgatroid99
b516cadc2a
Merge branch 'master' into uv_core_transport
2016-10-21 15:54:42 -07:00
Mark D. Roth
ae07f7fdc6
Merge remote-tracking branch 'upstream/master' into resolver_channel_args
2016-10-21 15:23:53 -07:00
Mark D. Roth
af84245131
Remove resolver_result.
2016-10-21 15:05:15 -07:00