diff options
| author |  murgatroid99 <mlumish@google.com> | 2015-10-05 10:18:05 -0700 |
|---|---|---|
| committer | murgatroid99 <mlumish@google.com> | 2015-10-05 10:18:05 -0700 |
| commit | b0f3bf16cee1d893fc0414fcfe1060baac4eaa9b (patch) | |
| tree | 747298bf60f8a0b1c519a33d6084fad42fc192de /src/ruby/bin | |
| parent | 350835a9566a4b56bfd409108ec235ef2424b630 (diff) | |
| parent | a9154a36fbc019b87f4d62ce16b346f3d44ec2de (diff) | |
Resolved merge conflicts with master
Diffstat (limited to 'src/ruby/bin')
| -rwxr-xr-x | src/ruby/bin/math_server.rb | 2 | ||||
| -rwxr-xr-x | src/ruby/bin/noproto_server.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/ruby/bin/math_server.rb b/src/ruby/bin/math_server.rb index 562f197317..1ee4c5632d 100755 --- a/src/ruby/bin/math_server.rb +++ b/src/ruby/bin/math_server.rb @@ -195,7 +195,7 @@ def main s.add_http2_port(options['host'], test_server_creds) GRPC.logger.info("... running securely on #{options['host']}") else - s.add_http2_port(options['host']) + s.add_http2_port(options['host'], :this_port_is_insecure) GRPC.logger.info("... running insecurely on #{options['host']}") end diff --git a/src/ruby/bin/noproto_server.rb b/src/ruby/bin/noproto_server.rb index 72a5762040..66554e26f6 100755 --- a/src/ruby/bin/noproto_server.rb +++ b/src/ruby/bin/noproto_server.rb @@ -101,7 +101,7 @@ def main s.add_http2_port(options['host'], test_server_creds) GRPC.logger.info("... running securely on #{options['host']}") else - s.add_http2_port(options['host']) + s.add_http2_port(options['host'], :this_port_is_insecure) GRPC.logger.info("... running insecurely on #{options['host']}") end |