diff options
| author |  Craig Tiller <ctiller@google.com> | 2015-02-03 11:43:58 -0800 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2015-02-03 11:43:58 -0800 |
| commit | d24480f3c897e133474bfc26ca34ac57521c4c4d (patch) | |
| tree | a7f390848439ea14809fe843311b06224e0dc888 | |
| parent | cefb00e8ebc204f9f661184dc1602b596c7575e7 (diff) | |
| parent | fef766933e8f20af555b99dafe2e80097f37a07e (diff) | |
Merge branch 'async-api' of github.com:ctiller/grpc into async-api
| -rw-r--r-- | include/grpc/grpc.h | 7 | ||||
| -rwxr-xr-x | src/ruby/grpc.gemspec | 2 |
2 files changed, 4 insertions, 5 deletions
diff --git a/include/grpc/grpc.h b/include/grpc/grpc.h index 927a47eba6..c18e47e54b 100644 --- a/include/grpc/grpc.h +++ b/include/grpc/grpc.h @@ -191,8 +191,8 @@ typedef enum grpc_completion_type { GRPC_FINISH_ACCEPTED, /* writes_done or write_status has been accepted */ GRPC_CLIENT_METADATA_READ, /* The metadata array sent by server received at client */ - GRPC_FINISHED, /* An RPC has finished. The event contains status. - On the server this will be OK or Cancelled. */ + GRPC_FINISHED, /* An RPC has finished. The event contains status. + On the server this will be OK or Cancelled. */ GRPC_SERVER_RPC_NEW, /* A new RPC has arrived at the server */ GRPC_SERVER_SHUTDOWN, /* The server has finished shutting down */ GRPC_COMPLETION_DO_NOT_USE /* must be last, forces users to include @@ -331,8 +331,7 @@ grpc_call *grpc_channel_create_call_old(grpc_channel *channel, gpr_timespec deadline); grpc_call_error grpc_call_start_batch(grpc_call *call, const grpc_op *ops, - size_t nops, grpc_completion_queue *cq, - void *tag); + size_t nops, void *tag); /* Create a client channel */ grpc_channel *grpc_channel_create(const char *target, diff --git a/src/ruby/grpc.gemspec b/src/ruby/grpc.gemspec index 2ce242dd0b..c479cc9616 100755 --- a/src/ruby/grpc.gemspec +++ b/src/ruby/grpc.gemspec @@ -25,7 +25,7 @@ Gem::Specification.new do |s| s.add_dependency 'logging', '~> 1.8' s.add_dependency 'jwt', '~> 1.2.1' s.add_dependency 'minitest', '~> 5.4' # reqd for interop tests - s.add_dependency 'multijson', '1.10.1' + s.add_dependency 'multi_json', '1.10.1' s.add_dependency 'signet', '~> 0.6.0' s.add_dependency 'xray', '~> 1.1' |