aboutsummaryrefslogtreecommitdiffhomepage
path: root/examples/ruby/lib
diff options
context:
space:
mode:
authorGravatar Yuchen Zeng <zyc@google.com>2016-08-24 18:22:24 -0700
committerGravatar Yuchen Zeng <zyc@google.com>2016-08-24 18:22:24 -0700
commit78cc066db2a2c8d65f63826f9f76f81c16d63b03 (patch)
tree12b5a169bd6b967ebcee2226d5b93f69bcb03609 /examples/ruby/lib
parent4dd1891665024d98b6655326f0c6277793b9b055 (diff)
parent19ea0cffd7ba3df686ed05671f9ed35b8e9fa830 (diff)
Merge remote-tracking branch 'upstream/master' into cares_buildin
Diffstat (limited to 'examples/ruby/lib')
-rw-r--r--examples/ruby/lib/helloworld_pb.rb (renamed from examples/ruby/lib/helloworld.rb)0
-rw-r--r--examples/ruby/lib/helloworld_services_pb.rb (renamed from examples/ruby/lib/helloworld_services.rb)2
-rw-r--r--examples/ruby/lib/route_guide_pb.rb (renamed from examples/ruby/lib/route_guide.rb)0
-rw-r--r--examples/ruby/lib/route_guide_services_pb.rb (renamed from examples/ruby/lib/route_guide_services.rb)2
4 files changed, 2 insertions, 2 deletions
diff --git a/examples/ruby/lib/helloworld.rb b/examples/ruby/lib/helloworld_pb.rb
index 82bdd78e2a..82bdd78e2a 100644
--- a/examples/ruby/lib/helloworld.rb
+++ b/examples/ruby/lib/helloworld_pb.rb
diff --git a/examples/ruby/lib/helloworld_services.rb b/examples/ruby/lib/helloworld_services_pb.rb
index fbec667794..4fee0aa2a9 100644
--- a/examples/ruby/lib/helloworld_services.rb
+++ b/examples/ruby/lib/helloworld_services_pb.rb
@@ -32,7 +32,7 @@
#
require 'grpc'
-require 'helloworld'
+require 'helloworld_pb'
module Helloworld
module Greeter
diff --git a/examples/ruby/lib/route_guide.rb b/examples/ruby/lib/route_guide_pb.rb
index 424395c4f5..424395c4f5 100644
--- a/examples/ruby/lib/route_guide.rb
+++ b/examples/ruby/lib/route_guide_pb.rb
diff --git a/examples/ruby/lib/route_guide_services.rb b/examples/ruby/lib/route_guide_services_pb.rb
index d8f123dd95..d43fcc64e9 100644
--- a/examples/ruby/lib/route_guide_services.rb
+++ b/examples/ruby/lib/route_guide_services_pb.rb
@@ -32,7 +32,7 @@
#
require 'grpc'
-require 'route_guide'
+require 'route_guide_pb'
module Routeguide
module RouteGuide