David Garcia Quintas
0892fa6aa6
Added copyright message to generated nanopb code
2016-01-12 16:22:34 -08:00
David Garcia Quintas
23f28a9b2c
Merge branch 'master' of github.com:grpc/grpc into grpclb_api
2016-01-12 15:41:59 -08:00
murgatroid99
3466c4b55d
Updated copyrights
2016-01-12 10:26:04 -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
Craig Tiller
7cc0f464d1
Merge github.com:grpc/grpc into proto_names
2016-01-07 16:37:03 -08:00
Yang Gao
848ee629dd
Merge pull request #4631 from sreecha/stress_test_logging
...
Add ability to control the verbosity of stress test logs
2016-01-06 23:01:21 -08:00
Craig Tiller
54ed674d40
Merge github.com:grpc/grpc into proto_names
2016-01-06 17:05:34 -08:00
Sree Kuchibhotla
7cecfa6c48
Adjust the log levels in interop tests and stress tests
2016-01-06 08:09:02 -08:00
Sree Kuchibhotla
0fa95eab81
Ability to filter log messages based on log level
2016-01-06 07:58:10 -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
00f8702c5e
Merge branch 'yawn' into proto_names
2015-12-22 14:23:51 -08:00
Craig Tiller
7536af02cf
Eliminate gpr_ int types - and insist on C99 variants instead
2015-12-22 13:49:30 -08:00
Craig Tiller
0fe5ee7be3
BoringSSL integration: non-vsprojects changes
2015-12-22 12:50:36 -08:00
Craig Tiller
dacb389907
Fix method name
2015-12-17 19:31:00 -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
David Garcia Quintas
7052ac25e6
Merge branch 'master' of github.com:grpc/grpc into grpclb_api
2015-12-16 17:36:04 -08:00
Yang Gao
5ff97a27a9
Merge pull request #4479 from ctiller/aarons-bug
...
Fix double read at end of stream bug
2015-12-16 09:52:47 -08:00
David Garcia Quintas
a2b7817481
Removed compression checks from vanilla large unary
2015-12-15 22:35:08 -08:00
Craig Tiller
ca9a637877
Fix double read at end of stream bug
2015-12-15 18:16:28 -08:00
Craig Tiller
620e965c1b
clang-format after last weeks test-fest
2015-12-14 12:02:50 -08:00
Yang Gao
5b763f5355
Merge pull request #4362 from vjpai/coverage-serve2
...
Cover an unsupported case of mixing sync and async service in server
2015-12-09 12:50:58 -08:00
vjpai
017ed62ce4
Cover an unsupported case of mixing sync and async service in same server
2015-12-09 10:42:54 -08:00
vjpai
ba2b8ed553
Add a case to cover multiple adds of generic service
2015-12-09 10:24:47 -08:00
Craig Tiller
56a363f36c
Fix for when grpc::string is not the same type as FLAGS_...
2015-12-03 16:37:27 -08:00
David Garcia Quintas
011e79a271
Merge branch 'master' of github.com:grpc/grpc into grpclb_api
...
# Conflicts:
# BUILD
# Makefile
# binding.gyp
# build.yaml
# gRPC.podspec
# tools/doxygen/Doxyfile.core.internal
# tools/run_tests/sources_and_headers.json
# vsprojects/vcxproj/grpc/grpc.vcxproj
# vsprojects/vcxproj/grpc/grpc.vcxproj.filters
# vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj
# vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj.filters
2015-12-03 13:09:54 -08:00
Craig Tiller
35c1d3c462
Merge pull request #4207 from yang-g/server_builder_options
...
Server builder options
2015-12-03 11:39:44 -08:00
Nicolas "Pixel" Noble
f9c58f3bf7
Merge branch 'release-0_12'
...
Conflicts:
src/core/security/credentials.c
test/core/security/credentials_test.c
2015-12-01 22:40:44 +01:00
yang-g
52705590e4
Add set pointer api to channel_arguments
2015-11-25 11:45:33 -08:00
yang-g
d9f6101967
merge with head
2015-11-24 10:39:23 -08:00
yang-g
3ff9727a37
merge with head
2015-11-20 17:01:57 -08:00
Sree Kuchibhotla
e1330ff451
Add multiple channels to each server
2015-11-20 10:03:32 -08:00
Julien Boeuf
114f39475f
Cpp example of how the plugins can be done.
2015-11-19 22:24:05 -08:00
Sree Kuchibhotla
bc3127d4c3
Address code review comments
2015-11-19 10:32:59 -08:00
Sree Kuchibhotla
dbf9061033
Merge branch 'master' into stress_tests_metrics
2015-11-19 10:29:39 -08:00
Sree Kuchibhotla
52a514a250
Address code review comments
2015-11-19 10:28:47 -08:00
David G. Quintas
6d8063261b
Merge pull request #4097 from ctiller/hpack_max_table_size
...
Support dynamic HPACK table resizing
2015-11-19 09:56:25 -08:00
Jan Tattermusch
846ae8d9c2
Merge pull request #4156 from jtattermusch/perf_testing_polishing
...
Performance proto polishing
2015-11-19 09:51:54 -08:00
Sree Kuchibhotla
87f51663ee
Merge branch 'master' into stress_tests_metrics
2015-11-19 08:48:56 -08:00
Jan Tattermusch
c5ebbd5b8f
use new perf proto options in c++
2015-11-18 17:17:34 -08:00
yang-g
71b962634e
merge with head
2015-11-18 11:41:30 -08:00
Craig Tiller
ab5611da62
Merge github.com:grpc/grpc into hpack_max_table_size
2015-11-18 11:27:35 -08:00
David G. Quintas
75b53d6a5d
Merge pull request #3993 from ctiller/new_op
...
Core transport & call cleanup
2015-11-18 08:52:10 -08:00
Julien Boeuf
232d625a84
Merge branch 'master' of github.com:grpc/grpc into core_creds_api_change
2015-11-17 20:55:13 -08:00
Julien Boeuf
6049ebd8d2
More C++ fixes (the merge did not quite work...).
2015-11-17 16:53:52 -08:00
Julien Boeuf
9a437c2c46
Forgot to fix driver.cc somehow...
2015-11-17 16:38:52 -08:00
Julien Boeuf
675b5ce861
Merge branch 'master' of github.com:grpc/grpc into core_creds_api_change
2015-11-17 15:05:45 -08:00
yang-g
a89bf50cf1
Handle cancel before start case
2015-11-17 14:19:17 -08:00
David Garcia Quintas
5dc96fb5b8
Comments
2015-11-17 09:58:34 -08:00