Merge pull request #3602 from grpc/release-0_11

Upmerge from beta to master.

7 files changed, 9 insertions, 8 deletions

diff --git a/src/ruby/README.md b/src/ruby/README.md
index 8c56ceb135..e6ffadcaa9 100644
--- a/src/ruby/README.md
+++ b/src/ruby/README.md
@@ -6,7 +6,7 @@ A Ruby implementation of gRPC.
 Status
 ------
 
-Alpha : Ready for early adopters
+Beta
 
 PREREQUISITES
 -------------
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
 
diff --git a/src/ruby/grpc.gemspec b/src/ruby/grpc.gemspec
index 093606bb8b..61cf18cf54 100755
--- a/src/ruby/grpc.gemspec
+++ b/src/ruby/grpc.gemspec
@@ -17,9 +17,10 @@ Gem::Specification.new do |s|
   s.requirements << 'libgrpc ~> 0.11.0 needs to be installed'
 
   s.files = %w( Rakefile )
-  s.files += Dir.glob('lib/**/*')
-  s.files += Dir.glob('ext/**/*')
   s.files += Dir.glob('bin/**/*')
+  s.files += Dir.glob('ext/**/*')
+  s.files += Dir.glob('lib/**/*')
+  s.files += Dir.glob('pb/**/*')
   s.test_files = Dir.glob('spec/**/*')
   %w(math noproto).each do |b|
     s.executables += ["#{b}_client.rb", "#{b}_server.rb"]
diff --git a/src/ruby/lib/grpc/generic/client_stub.rb b/src/ruby/lib/grpc/generic/client_stub.rb
index 24ec1793f6..8c92384529 100644
--- a/src/ruby/lib/grpc/generic/client_stub.rb
+++ b/src/ruby/lib/grpc/generic/client_stub.rb
@@ -170,7 +170,7 @@ module GRPC
                          deadline: nil,
                          timeout: nil,
                          return_op: false,
-                         parent: parent,
+                         parent: nil,
                          **kw)
       c = new_active_call(method, marshal, unmarshal,
                           deadline: deadline,
diff --git a/src/ruby/lib/grpc/version.rb b/src/ruby/lib/grpc/version.rb
index 108c22b25e..9acf7a055a 100644
--- a/src/ruby/lib/grpc/version.rb
+++ b/src/ruby/lib/grpc/version.rb
@@ -29,5 +29,5 @@
 
 # GRPC contains the General RPC module.
 module GRPC
-  VERSION = '0.11.0'
+  VERSION = '0.11.1'
 end
diff --git a/src/ruby/pb/test/server.rb b/src/ruby/pb/test/server.rb
index a311bb76e6..32934f70ad 100755
--- a/src/ruby/pb/test/server.rb
+++ b/src/ruby/pb/test/server.rb
@@ -187,7 +187,7 @@ def main
     s.add_http2_port(host, test_server_creds)
     GRPC.logger.info("... running securely on #{host}")
   else
-    s.add_http2_port(host)
+    s.add_http2_port(host, :this_port_is_insecure)
     GRPC.logger.info("... running insecurely on #{host}")
   end
   s.handle(TestTarget)