Skip to content
Snippets Groups Projects
Commit f624a796 authored by Nicolas Noble's avatar Nicolas Noble
Browse files

Merge pull request #6537 from grpc/release-0_14

Upmerge from 0.14.0, again :D
parents c8b25434 0840b857
No related branches found
No related tags found
No related merge requests found
...@@ -49,7 +49,12 @@ module GRPC ...@@ -49,7 +49,12 @@ module GRPC
fail(TypeError, '!Channel') unless alt_chan.is_a?(Core::Channel) fail(TypeError, '!Channel') unless alt_chan.is_a?(Core::Channel)
return alt_chan return alt_chan
end end
kw['grpc.primary_user_agent'] = "grpc-ruby/#{VERSION}" if kw['grpc.primary_user_agent'].nil?
kw['grpc.primary_user_agent'] = ''
else
kw['grpc.primary_user_agent'] += ' '
end
kw['grpc.primary_user_agent'] += "grpc-ruby/#{VERSION}"
unless creds.is_a?(Core::ChannelCredentials) || creds.is_a?(Symbol) unless creds.is_a?(Core::ChannelCredentials) || creds.is_a?(Symbol)
fail(TypeError, '!ChannelCredentials or Symbol') fail(TypeError, '!ChannelCredentials or Symbol')
end end
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment