Merge branch 'async-api' of github.com:ctiller/grpc into async-api

10 years ago · d24480f3c8
parent cefb00e8eb fef766933e
commit d24480f3c8
2 changed files with 4 additions and 5 deletions
--- a/include/grpc/grpc.h
+++ b/include/grpc/grpc.h
@ -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,
--- 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'