e3e17d3f6b
Merge branch 'v1.0.x' of https://github.com/grpc/grpc
2016-08-20 01:45:32 +02:00
6cfc80edaf
Merge pull request #7762 from KindDragon/master
...
Fix CMake for windows (VS2015)
2016-08-18 16:53:43 -07:00
40beb37859
Fix CMake for Windows
2016-08-18 12:35:58 +03:00
9429717fc3
Merge pull request #7735 from y-zeng/cli_main_fork
...
Improve gRPC CLI
2016-08-17 17:02:40 -07:00
b80d9c9626
Merge pull request #7594 from chedeti/grpc-thrift-v2
...
grpc thrift integration
2016-08-17 16:59:20 -07:00
a469e5d42e
grpc++_unsecure shouldn't depend on grpc but on grpc_unsecure.
2016-08-17 05:47:55 +02:00
02139a05dc
Add CliCredentials, config_grpc_cli.h
2016-08-15 11:34:21 -07:00
26386e1fa0
Merge remote-tracking branch 'upstream/master' into cli_main_fork
2016-08-15 10:27:03 -07:00
50be893eba
Merge pull request #6915 from markdroth/filter_api
...
Implement C++ API for defining channel filters.
2016-08-05 15:11:18 -07:00
5af33e925a
Forgot one file
2016-08-04 00:35:55 +02:00
ca1558753a
Merge branch 'master' of https://github.com/grpc/grpc into interop_server_split
2016-08-04 00:30:37 +02:00
5d96056293
regenerated projects
2016-08-03 00:24:37 -07:00
5e1fbd2061
Merge pull request #7370 from rjshade/move_timeout_encoding
...
Move timeout_encoding to core/lib/transport
2016-08-02 16:20:01 -07:00
85c1168d17
Merge remote-tracking branch 'upstream/master' into filter_api
2016-08-02 14:07:00 -07:00
329d6473db
Merge pull request #6774 from a-veitch/add_resource
...
Add Census resource API and implementation.
2016-08-02 12:46:43 -07:00
3ac6fc1b97
Merge branch 'filter_call_init_failure' into filter_api
2016-08-02 10:07:48 -07:00
6e26952db4
Merge remote-tracking branch 'upstream/master' into filter_call_init_failure
2016-08-02 10:05:17 -07:00
4e7259dcaa
Merge branch 'master' of https://github.com/grpc/grpc into interop_server_split
2016-08-02 18:32:05 +02:00
52c54e3c3b
Merge branch 'master' of github.com:grpc/grpc into grpclb_v0
2016-08-01 19:42:55 -07:00
a17039aaa4
refine code and add README
2016-08-01 17:32:06 -07:00
3856a972fd
regenerated projects
2016-08-01 16:46:11 -07:00
62105352be
Merge branch 'master' of github.com:grpc/grpc into lr_july_16
2016-08-01 14:52:02 -07:00
87e06c84fd
Merge branch 'master' of github.com:grpc/grpc into grpclb_v0
2016-08-01 11:02:22 -07:00
bc618eed71
thrift serializer
2016-07-31 15:35:51 -07:00
43b633d54f
Merge branch 'master' into move_timeout_encoding
2016-07-26 07:44:10 -04:00
e7068c836e
Remove references to string_ref_helper
2016-07-25 17:30:45 -07:00
36a6fe6052
Merge remote-tracking branch 'upstream/master' into cli_main
2016-07-25 15:51:10 -07:00
bc0b08892f
Merge branch 'master' of https://github.com/grpc/grpc into interop_server_split
...
Conflicts:
Makefile
2016-07-25 23:51:01 +02:00
28263275f0
Remove unnecessary dependencies
2016-07-25 14:38:07 -07:00
b5fa72c89e
Merge pull request #7451 from y-zeng/seperate_generated_files
...
Separate generated pb files from the server reflection build target, use grpc::protobuf instead of google::protobuf
2016-07-25 14:32:51 -07:00
c326407379
Merge branch 'master' of https://github.com/grpc/grpc into interop_server_split
2016-07-25 21:51:59 +02:00
29ca79be89
Command processing, validation
2016-07-25 12:00:08 -07:00
de2d9fc07b
Merge pull request #7395 from markdroth/handshake_api
...
General-purpose handshaker API.
2016-07-25 10:01:47 -07:00
3abd27e531
merge to upstream/master
2016-07-21 17:29:04 -07:00
b8208ff79a
Merge pull request #7269 from y-zeng/cli_call
...
Support server reflection in CLI
2016-07-21 17:11:36 -07:00
6570b83c9c
Splitting interop_server.cc
2016-07-18 23:42:35 +02:00
1318479011
Separate generated file and protobuf dependency
2016-07-18 13:07:42 -07:00
7c3ba12813
Merge branch 'master' of github.com:grpc/grpc into grpclb_v0
2016-07-14 14:13:41 -07:00
dfbdefedd3
Added handshaker.[ch] to build.yaml.
2016-07-14 09:18:22 -07:00
824363dc2f
Simplified LR filter
2016-07-13 23:48:20 -07:00
710d242e89
Move timeout_encoding from core/ext/transport/chttp2 to core/lib/transport
2016-07-13 15:15:38 -04:00
6f6f59ae4b
Merge remote-tracking branch 'upstream/master' into filter_call_init_failure
2016-07-12 14:10:47 -07:00
14bed44db2
Merge remote-tracking branch 'upstream/master' into filter_api
2016-07-12 14:09:41 -07:00
b395c9e278
Merge remote-tracking branch 'origin/fix_tsan' into lr_july_16
2016-07-11 22:20:42 -07:00
01c4d995d3
Added new features to load reporting.
...
- Propagation of (rpc) method name.
- Invocation of the hook at (call, channel) x (creation, destruction)
- Added enum to identify the source of invocation.
- Fixed testing. Went from test fixture to simple test.
2016-07-10 20:57:52 -07:00
f0ec5b673c
Fix mac build
2016-07-08 13:40:40 -07:00
39070fe3a5
Rerun generate_projects.sh
2016-07-07 13:57:12 -07:00
256cc7aa03
Support server reflection in CLI
2016-07-07 11:09:49 -07:00
5c77320ce0
Added missing dependencies to grpc++_base
2016-07-06 16:36:45 -07:00
123a1b76d3
Merge pull request #6893 from y-zeng/handler_http_response
...
Add http2 status code in error_message if it's not 200
2016-07-01 16:39:31 -07:00
Nicolas "Pixel" Noble