diff options
| author |  Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2016-07-29 22:48:16 +0200 |
|---|---|---|
| committer | Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2016-07-29 22:48:16 +0200 |
| commit | 8302b123de49ba2eda5c807fa31603b47a15a37b (patch) | |
| tree | 7779b6a67b635d8b62f113de72c7c70747e65889 /src/ruby/pb/test | |
| parent | c70f2f76faba2a52286e033b9f7d44aca290b0ec (diff) | |
| parent | 531c90907386e91bec0b9f038fef19349fba581b (diff) | |
Merge branch 'v1.0.x' into manual-upmerge
Conflicts:
src/ruby/pb/test/client.rb
src/ruby/pb/test/server.rb
tools/dockerfile/test/php7_jessie_x64/Dockerfile
Diffstat (limited to 'src/ruby/pb/test')
| -rwxr-xr-x | src/ruby/pb/test/client.rb | 6 | ||||
| -rwxr-xr-x | src/ruby/pb/test/server.rb | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/ruby/pb/test/client.rb b/src/ruby/pb/test/client.rb index 4c6d441dcb..1e3ae65630 100755 --- a/src/ruby/pb/test/client.rb +++ b/src/ruby/pb/test/client.rb @@ -52,9 +52,9 @@ require_relative '../../lib/grpc' require 'googleauth' require 'google/protobuf' -require_relative '../src/proto/grpc/testing/empty' -require_relative '../src/proto/grpc/testing/messages' -require_relative '../src/proto/grpc/testing/test_services' +require_relative '../src/proto/grpc/testing/empty_pb' +require_relative '../src/proto/grpc/testing/messages_pb' +require_relative '../src/proto/grpc/testing/test_services_pb' AUTH_ENV = Google::Auth::CredentialsLoader::ENV_VAR diff --git a/src/ruby/pb/test/server.rb b/src/ruby/pb/test/server.rb index 11ee3d465d..0808121661 100755 --- a/src/ruby/pb/test/server.rb +++ b/src/ruby/pb/test/server.rb @@ -50,9 +50,9 @@ require 'optparse' require 'grpc' -require_relative '../src/proto/grpc/testing/empty' -require_relative '../src/proto/grpc/testing/messages' -require_relative '../src/proto/grpc/testing/test_services' +require_relative '../src/proto/grpc/testing/empty_pb' +require_relative '../src/proto/grpc/testing/messages_pb' +require_relative '../src/proto/grpc/testing/test_services_pb' # DebugIsTruncated extends the default Logger to truncate debug messages class DebugIsTruncated < Logger |