diff options
| author |  Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2015-08-13 02:07:12 +0200 |
|---|---|---|
| committer | Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2015-08-13 02:07:12 +0200 |
| commit | d9745cab08c168db07afb4b2a6499f51123a67c9 (patch) | |
| tree | 56b6f248fd9aaf00979d6e2e23414cb3c543596f /src/ruby/spec/generic | |
| parent | 720903ae6da6a71641f57184b102b4385db64b99 (diff) | |
| parent | 46e786ba60283e696a88ec1cf16e7eeb3a20efe5 (diff) | |
Merge branch 'master' of github.com:grpc/grpc into the-ultimate-showdown
Conflicts:
src/ruby/ext/grpc/rb_channel.c
Diffstat (limited to 'src/ruby/spec/generic')
| -rw-r--r-- | src/ruby/spec/generic/active_call_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/ruby/spec/generic/active_call_spec.rb b/src/ruby/spec/generic/active_call_spec.rb index 424b2dbdeb..0bf65ba2e9 100644 --- a/src/ruby/spec/generic/active_call_spec.rb +++ b/src/ruby/spec/generic/active_call_spec.rb @@ -338,7 +338,7 @@ describe GRPC::ActiveCall do end def make_test_call - @ch.create_call(@client_queue, '/method', nil, deadline) + @ch.create_call(@client_queue, nil, nil, '/method', nil, deadline) end def deadline |